[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging emacs-23 into trunk
From: |
Stefan Monnier |
Subject: |
Re: Merging emacs-23 into trunk |
Date: |
Thu, 11 Nov 2010 14:57:40 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
>>> You are cherry-picking here; cherry-picking is explicitly not tracked
>>> in the history DAG.
>> Actually, I'm not cherry-picking: Since all changes until A have been
>> merged, merging A..B will end up with all changes until B: I'm not
>> picking some changes and avoiding others.
>> And indeed
>> bzr merge -r A..B
>> will correctly track the history in the case where A has already been
>> merged and committed.
> No. It will keep the order of the commits, but that's is all it does as
> far as the VC history is concerned.
I have no idea what you mean by the above, but I have tried and tested
bzr merge -r A..B
and in all my tests, in the case where A has already been merged into
the current tree, it behaves exactly like
bzr merge -r B
with respect to history-tracking.
Stefan
- 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, 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 <=
- Re: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/11
- Message not available
- Re: Merging emacs-23 into trunk, Óscar Fuentes, 2010/11/12
- Re: Merging emacs-23 into trunk, Stefan Monnier, 2010/11/15