[PATCH 2 of 2 V2] rebase: support multiple roots for rebaseset
Kevin Bullock
kbullock+mercurial at ringworld.org
Tue Jan 15 21:52:34 CST 2013
On 15 Jan 2013, at 5:55 PM, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1358293892 -3600
> # Node ID c8e37ef7699046fd03bb2e5cef35cf0ea950ee2c
> # Parent 470c5d72dac420aa91a45e61acf4894da7f22843
> rebase: support multiple roots for rebaseset
>
> We have all the necessary mechanism to rebase a set with multiple roots, we only
> needed a proper handling of this case we preparing and concluding the rebase.
> This changeset des that.
And when you rebase a set with multiple roots, where do they get rebased _to_? How are the semantics of a multiple-root rebase defined?
> diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
> --- a/tests/test-rebase-obsolete.t
> +++ b/tests/test-rebase-obsolete.t
> @@ -282,11 +282,11 @@ not be rebased.
> Test rewriting leaving unstability behind is allowed
> ---------------------------------------------------------------------
>
> $ hg log -r 'children(8)'
> 9:cf44d2f5a9f4 D (no-eol)
> - $ hg rebase -r 8
> + $ hg rebase --rev 8
[Still] unrelated change?
pacem in terris / мир / शान्ति / سَلاَم / 平和
Kevin R. Bullock
More information about the Mercurial-devel
mailing list