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 04:12:24 +0900
> 
> Eli Zaretskii writes:
>  > > From: "Stephen J. Turnbull" <stephen at xemacs.org>
> 
>  > > 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.
> 
> My point is that you need a different algorithm depending on the
> direction of merge.  If this algorithm is default (eg, using an alias),
> you will silently corrupt the logs.

No, there will be no corruption, because when I merge from mainline, I
need to edit the logs anyway.