Re: Moving Emacs 24.3 development to emacs-24 branch soon

[Eli Zaretskii]

> From: Chong Yidong <address@hidden>
> Date: Thu, 01 Nov 2012 10:12:16 +0800
> 
> 2. In the `trunk' branch, 
>    bzr push bzr+ssh://address@hidden/emacs/emacs-24
>    This pushes the contents of `trunk' into `emacs-24'.

I don't think you can do that.  "push" is only possible from a branch
that didn't diverge from the target.  You should "merge" (from trunk
to emacs-24) instead, and then commit.

However, merging will probably mess up the history in a way that will
make forensics difficult.  So I agree with Andreas and Dani who
proposed a separate branch instead.