version control - complicated diff usage - Thread - go-pugleaf

Thread View: comp.os.linux.misc

3 messages

[T] Back to Threads [V] Tree View [G] Group Articles

3 total messages Started by Sascha Spangenberg Wed, 10 Mar 1999 00:00

version control - complicated diff usage

#1225

Author: 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
...

Re: version control - complicated diff usage

#1226

Author: NF Stevens
Date: Wed, 10 Mar 1999 00:00

24 lines
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

Re: version control - complicated diff usage

#1227

Author: Giovanni Faggioli
Date: Wed, 10 Mar 1999 00:00

31 lines
1663 bytes

Sascha Spangenberg <ssp@ee.ed.ac.uk> writes:

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

With 'sdiff' you can merge interactively two files.
If version 1.0 is still available, 'merge' from the rcs-suite
is another option.

Good Luck,

Giovanni

Thread Navigation

This is a paginated view of messages in the thread with full content displayed inline.

Messages are displayed in chronological order, with the original post highlighted in green.

Use pagination controls to navigate through all messages in large threads.

Back to All Threads