Hello, On Wed, May 02, 2007 at 12:12:56PM +1000, Alexander Zangerl wrote: > Package: unison > Version: 2.13.16-5 > Followup-For: Bug #394946 > > in version 2.10 the unison authors revamped the merging > setup completely: > the functionality of merge and merge2 was merged into merge :-) > > they didn't fully update the documentation and left the > old changes referencing merge2 in there. > > that change also requires one's merge properties > to be reworked substantially to make it work again. this is > badly documented in my opinion, and i had to wade through > the source to figure it out; maybe there might be a nice NEWS.Debian > with some info for the next version? > > *) an merging is run only after confirming to commit the updates, > not immediately as before. > > *) also before merge applied to files with backups, merge2 to everything else. > now it's all one merger, but one has to provide extra special strings > to control the behaviour. > > *) simply using CURRENT1, CURRENT2 and CURRENTARCH as suggested in > the example on line 1866 of the manual does NOT work if backups aren't > enabled! unison throws a somewhat misleading exception in that case and dies > altogether. > > *) one must use CURRENTARCHOPT to catch both backup and no-backup cases, > which is stupidly set to " " (one blank, not empty) in the no-backup case. > line 1819 of the manual is wrong, the cause seems to be line 617 of files.ml. > > *) to make the emacs/ediff example work, it is necessary to run > ediff-merge-files or ediff-merge-files-with-ancestor > depending on CURRENTARCHOPT (because e-m-f-w-a is not happy with a > dud " " as the ancestor file). > > merge = Name *.txt -> emacs --eval '(if (not (string= "CURRENTARCHOPT" " ")) > (ediff-merge-files-with-ancestor "CURRENT1" "CURRENT2" > "CURRENTARCHOPT" nil "NEW") > (ediff-merge-files "CURRENT1" "CURRENT2" nil "NEW"))' >
I will paste this text in NEWS.debian (maybe shorter...) Regards Sylvain Le Gall -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
