On Wed, Jun 25, 2003 at 04:05:25PM +1200, Nick Rout wrote: > what happens if you change both versions before a sync up?
If the changes are non-conflicting (i.e. in different files) then both copies are updated based on last modification time. If the changes conflict (and I can't remember if it's on a file-basis, or on file-content) then the user is consulted. i.e. if the file set is 'a','b' and 'c' on server '1' and '2',and a1 and b2 have been updated, the final set on both servers becomes a1 b2 c(whatever) There is a 'direction preference' you can set, if you want conflicts to be automatically resolved (i.e. declare one side of the transfer to be the master). -jim > > On Wed, 25 Jun 2003 03:08:10 +0100 > Jim Cheetham <[EMAIL PROTECTED]> wrote: > > > For my target usage, it was invaluable. I maintained a few static > > websites from my pc, and published them with unison to the web server. > > Occasionally I would want to hack on the website directly on the server, > > especially when using a different pc. No problem - and the next time I > > used unison to synchronise from the 'usual' pc, the changes came back > > down - no need to especially remember them. > > > > Building Unison from source may be a mission, unless you already have > > Objective Caml installed ... because that's what Unison is written in. > > -- > Nick Rout <[EMAIL PROTECTED]> > > >
