Re: Confusing "bzr log" as result of merges

[Andreas Schwab]

Óscar Fuentes <address@hidden> 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.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."