Re: Confusing "bzr log" as result of merges

["Óscar Fuentes" <ofv@wanadoo.es>]

Andreas Schwab <schwab@linux-m68k.org> writes:

> Óscar Fuentes <ofv@wanadoo.es> writes:
>
>> You don't know with 100% reliability. If a change committed into
>> emacs-common does not belong there, do the same you do with the rest of
>> wrong commits: revert it.
>
> I'm talking about the commits in the trunk that also belong in the
> emacs-23 branch.  You either have to cherry-pick them into the
> emacs-common branch, or into the emacs-23 branch.  Still the same
> duplication as we have now.

If a commit goes straight to trunk when it should go to emacs-common,
either cherry-pick it into emacs-23, as you say, which has the effect of
"polluting" the VC history of emacs-23, or revert it in trunk and commit
into emacs-common, which has the effect of "polluting" the VC history of
trunk. IMO the former is preferable.

One thing fundamentally wrong with the current practice is that emacs-23
ends with a mostly clean VC history while trunk accumulates all the mess
created by cherry-picks. emacs-23 will eventually die, but trunk is
supposed to live forever.