[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging emacs-23 into trunk
From: |
Óscar Fuentes |
Subject: |
Re: Merging emacs-23 into trunk |
Date: |
Fri, 12 Nov 2010 17:51:47 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
Stefan Monnier <address@hidden> writes:
>> Yes, when A (or its parent) already is on the target branch with the
>> same revision-id as it has on the source branch.
>
> Which is exactly the situation I was talking about:
>
> And indeed
> bzr merge -r A..B
> will correctly track the history in the case where A has already been
> merged and committed.
"merge -r A..B" usually means a cherry-pick, because for the case when
it is a merge there is no reason to specify A (the tool figures it out
automatically) but it seems that you missed the syntax "merge -r B"
- Re: Merging emacs-23 into trunk, (continued)
- Re: Merging emacs-23 into trunk, Stefan Monnier, 2010/11/10
- Re: Merging emacs-23 into trunk, Eli Zaretskii, 2010/11/10
- Re: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/10
- Re: Merging emacs-23 into trunk, Eli Zaretskii, 2010/11/11
- Re: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/11
- Re: Merging emacs-23 into trunk, Stephen J. Turnbull, 2010/11/10
- Re: Merging emacs-23 into trunk, Eli Zaretskii, 2010/11/11
- Re: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/10
- Re: Merging emacs-23 into trunk, Stefan Monnier, 2010/11/11
- Re: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/11
- Message not available
- Re: Merging emacs-23 into trunk,
Óscar Fuentes <=
- Re: Merging emacs-23 into trunk, Stefan Monnier, 2010/11/15