Merge algorithms

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <stephen at xemacs.org>
> Cc: john at arbash-meinel.com,
>     mbp at canonical.com,
>     bazaar at lists.canonical.com
> Date: Sat, 18 Sep 2010 03:03:20 +0900
> 
> If you ever merge back from trunk into a long-running-branch, then
> when you do merge into trunk, a naive "merge source log entries
> float to top of merged ChangeLog" algorithm will certainly result in
> interleaving the branch log entries with the trunk entries.  Now
> what?

Merges from mainline need special (manual) handling of the logs
anyway. So nothing is lost here.

> I think the proposed plug-in will probably work well for 95% of Emacs
> contributors 100% of the time, and for the other 5%, 95% of the time.
> It's probably worth doing on that basis.  But projects with many
> people who are used to working in a more distributed fashion might not
> get such good results.

It should be good enough to have this a non-default option.  Then
those who want it can make a bzr alias that will use it by default.