Re: Confusing "bzr log" as result of merges

[Óscar Fuentes]

Andreas Schwab <address@hidden> writes:

> Óscar Fuentes <address@hidden> writes:
>
>> Avoid cherry-picking. Always do merges.
>
> Cherry-picks are a fact of life.  You cannot avoid them completely.

Never cherry-pick from emacs-common. Why would you cherry pick from
emacs-common into emacs-23 or trunk, instead of just merging?

>> Create a branch emacs-common and commit there all the changes
>> intended for emacs-23 and trunk.
>
> And how do you know with 100% reliability?

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 not saying that the proposed schema is perfect, it simply is better
than what we do now.