version control - complicated diff usage - Article 1225 - go-pugleaf

Article View: comp.os.linux.misc

Article #1225

Back to comp.os.linux.misc Previous Next

version control - complicated diff usage

#1225

From: Sascha Spangenberg
Date: Wed, 10 Mar 1999 00:00

73 lines
2043 bytes

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???

Any ideas???

Sascha.

PS:  An example?

foo and foo2 v1.0
===============
...
line1
line2
line3
line4
...

foo v1.1
===============
...
line1
line2.1
line3
line4
....

foo v1.2
===============
...
line1
line2.1
line3.2
line4
...

foo2 v1.1
===============
...
line1
line2.1
line2a
line3
line4.1
line5
...

foo2 v1.2
===============
...
line1
line2.1
line2a
line3.2   <- changed "line3" to "line3.2" as in foo 1.1->1.2
line4.1
line5
...

Technical Details

Message-ID: <36E661D4.D192F5D3@ee.ed.ac.uk>

Path: arc1-ca.pugleaf.net!unknown!not-for-mail

Show Full Headers

Complete Article Headers

X-Google-Language: ENGLISH,ASCII-7-bit
X-Google-Thread: 106243,3ddeb2681666593e,start
X-Google-Attributes: gid106243,public
X-Google-Thread: 1107b1,3ddeb2681666593e,start
X-Google-Attributes: gid1107b1,public
X-Google-Thread: 1103af,3ddeb2681666593e,start
X-Google-Attributes: gid1103af,public
X-Google-Thread: 1025b4,3ddeb2681666593e,start
X-Google-Attributes: gid1025b4,public
From: Sascha Spangenberg <ssp@ee.ed.ac.uk>
Subject: version control - complicated diff usage
Date: 1999/03/10
Message-ID: <36E661D4.D192F5D3@ee.ed.ac.uk>
X-Deja-AN: 453357957
Content-Transfer-Encoding: 7bit
X-Accept-Language: en
Content-Type: text/plain; charset=us-ascii
X-Complaints-To: usenet@scotsman.ed.ac.uk
X-Trace: scotsman.ed.ac.uk 921067836 6252 129.215.102.94 (10 Mar 1999 12:10:36 GMT)
Organization: Edinburgh University
Mime-Version: 1.0
NNTP-Posting-Date: 10 Mar 1999 12:10:36 GMT
Newsgroups: comp.os.linux.misc,gnu.misc.discuss,comp.emacs.xemacs,ed.linux