Re: [Sheflug] Synchronising local files

[Dave Mitchell <davem [at] xxxxxxxxxxx>]

On Wed, May 07, 2003 at 08:52:58PM +0100, Tom Knight wrote:
> A course-mate and I have been writing Java code for an assignment we're
> doing. We've been working separately on the same files and now it's time
> to get the two sets of files synchronised. I've just tried using rsync,
> but it doesn't work as I though it did.
> 
> So after doing `rsync * code/` I was left with code/ being the same as
> ./, i.e. the transfer occurs only in one direction, is there a way for
> having it work in both directions at the same time, so I'm left with
> code which is a mixture of both sets of code. I'm assuming this is
> possible (most things are with Linux :-) and I don't have to a a diff
> and then cut+paste by hand.

Well, the 'proper' way would be to set up a CVS repository; you and your
friend both check out a copy, make all your changes, then try to check the
changfes back in. CVS would alutomatically try and merge back both sets of
changes, and warn you where the changes overlap.

But since you havent' much time, you may want to ruin merge(1) on each
file individually, which is sort of like doing a CVS checkin manaully for
each file.



-- 
"You're so sadly neglected, and often ignored.
A poor second to Belgium, When going abroad."
Monty Python - "Finland"
___________________________________________________________________

Sheffield Linux User's Group -
http://www.sheflug.co.uk/mailfaq.html

  GNU the choice of a complete generation.