http://bugzilla.novell.com/show_bug.cgi?id=473776
http://bugzilla.novell.com/show_bug.cgi?id=473776#c12
--- Comment #12 from Andreas Gruenbacher
It would probably make sense to add some function of the line numbers to the weight using in 'bestmatch'.
That might work, and it would then also make sense to switch to that global strategy in patch too -- patch's current algorithm has bad worst case performance. The underlying algorithm makes it hard to change the metric, but if you find a clean way, I'd definitely love to hear about it :)
I didn't know about "patch --merge", but I don't like it. It discards important information - the 'before' part of the patch which gives context for the 'after' part.
I guess I can live with that, especially since --merge[=merge] is only the default, and --merge=diff3 will produce the 'before' part when desired. -- 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.