[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Moving Emacs 24.3 development to emacs-24 branch soon
From: |
Chong Yidong |
Subject: |
Re: Moving Emacs 24.3 development to emacs-24 branch soon |
Date: |
Thu, 01 Nov 2012 21:58:35 +0800 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) |
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.
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Andreas Schwab, 2012/11/01
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Andreas Schwab, 2012/11/01
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Eli Zaretskii, 2012/11/01
- Re: Moving Emacs 24.3 development to emacs-24 branch soon,
Chong Yidong <=
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Andreas Schwab, 2012/11/01
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Stephen J. Turnbull, 2012/11/01
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Stefan Monnier, 2012/11/01
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Stephen J. Turnbull, 2012/11/03
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Eli Zaretskii, 2012/11/04
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Juanma Barranquero, 2012/11/04
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Stephen J. Turnbull, 2012/11/05
Re: Moving Emacs 24.3 development to emacs-24 branch soon, Glenn Morris, 2012/11/01