[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: |
Eli Zaretskii |
Subject: |
Re: Moving Emacs 24.3 development to emacs-24 branch soon |
Date: |
Thu, 01 Nov 2012 15:47:56 +0200 |
> 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.
- 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 <=
- Re: Moving Emacs 24.3 development to emacs-24 branch soon, Chong Yidong, 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, 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