1 Feb 2008 03:28
Re: Merging with diff3: exit status problem
Wm... <wm-unison <at> tarrcity.demon.co.uk>
2008-02-01 02:28:37 GMT
2008-02-01 02:28:37 GMT
Thu, 31 Jan 2008 18:38:55 <47A207AF.9050305 <at> hot.ee> Misha Aizatulin <avatar <at> hot.ee> >hello, > > I am struggling to make merging with unison work. The issue is the >following: the unison manual says > >"If the merge program exits with a non-zero status, then merge is >considered to have failed and the replicas are not changed." > > The manpage for diff3 says: >====================================== > The following exit values are returned: > > 0 Successful completion. > > > > 1 An error occurred. A difference was found or there > was a fatal error. >====================================== > > So every time the two files are different, diff3 returns 1 as exit >status. As a result, unison won't do the merge: > >Failed [file]: One output detected but merge command returned nonzero >exit status > > What am I missing here? I'd be thankful for any suggestions.(Continue reading)
RSS Feed