Article View: comp.os.linux.misc
Article #1226Re: version control - complicated diff usage
From: NF Stevens
Date: Wed, 10 Mar 1999 00:00
Date: Wed, 10 Mar 1999 00:00
24 lines
1568 bytes
1568 bytes
Sascha Spangenberg <ssp@ee.ed.ac.uk> wrote: >Hi there, > >is s.o. out there who knows how to do the following.... > >I have a file called foo version 1.0 >I edit foo v1.0 and save it as v1.1 >I further edit v1.1 and save it as v1.2 > >Now I copy foo v1.0 to - say foo2 v1.0- edit this file and save it at >v1.1 > >At this stage I want to apply the same changes to foo2 v1.1 as I did in >foo from v1.1->v1.2 >Assume that the parts where changes need to be made shall be > * identical in foo v1.1 and foo2 v1.1 BUT > * at different positions withing the files... > >Is there a way of doing this with diff or so??? > patch is what you want. Norman
Technical Details
Message-ID:
<36e6e22a.13512797@news.u-net.com>Path:
arc1-ca.pugleaf.net!unknown!not-for-mailReferences:
<36E661D4.D192F5D3@ee.ed.ac.uk>Show Full Headers
Complete Article Headers
X-Google-Language: ENGLISH,ASCII-7-bit X-Google-Thread: 106243,3ddeb2681666593e X-Google-Attributes: gid106243,public X-Google-Thread: 1025b4,3ddeb2681666593e X-Google-Attributes: gid1025b4,public X-Google-Thread: 1103af,3ddeb2681666593e X-Google-Attributes: gid1103af,public X-Google-Thread: 1107b1,3ddeb2681666593e X-Google-Attributes: gid1107b1,public From: norman@arcady.u-net.com (NF Stevens) Subject: Re: version control - complicated diff usage Date: 1999/03/10 Message-ID: <36e6e22a.13512797@news.u-net.com> X-Deja-AN: 453569509 References: <36E661D4.D192F5D3@ee.ed.ac.uk> X-Complaints-To: news@u-net.net X-Trace: newsr2.u-net.net 921106921 195.102.198.50 (Wed, 10 Mar 1999 23:02:01 BST) Organization: (Posted via) U-NET Internet Ltd. NNTP-Posting-Date: Wed, 10 Mar 1999 23:02:01 BST Newsgroups: comp.os.linux.misc,gnu.misc.discuss,comp.emacs.xemacs,ed.linux