http://bugzilla.novell.com/show_bug.cgi?id=473776 http://bugzilla.novell.com/show_bug.cgi?id=473776#c10 --- Comment #10 from Andreas Gruenbacher <agruen@novell.com> 2010-03-24 10:55:18 UTC ---
I think that ignoring already-applied changes is usually the desired thing to do
I meanwhile agree. Note that patch also has a --merge option now: it does a line-wise merge, but slightly different than wiggle: it applies each hunk individually, and as close to the original location of the hunk as possible. Wiggle seems to apply all hunks at once, and IIUC if a hunk applies equally well at several places in a file (and there are no other constraints due to other hunks, it will not necessarily pick the location closest to the original location. Did I get this right? So patch will sometimes find better matches, but if it gets out of sync, it will also fail in more horrible ways. (Patch also doesn't do anything other than line-wise merges.) -- Configure bugmail: http://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.