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

[Chong Yidong]

Eli Zaretskii <address@hidden> writes:

>>    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.

As Stefan pointed out to me in a separate email, pushing will work, one
just has to set the bzr configuration variable append_revisions_only to
False.  The bzr tag doesn't seem to be discarded by the push, either; it
is still possible to check it out with -r TAGNAME afterward.