Mercurial > hg
diff tests/test-rebase-obsolete.t @ 18424:100fdc84670f
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.
Rebase set with multiple root allows some awesome usage of rebase like:
- rebase all your draft on lastest upstream
hg rebase --dest @ --rev 'draft()'
- exclusion of specific changeset during rebase
hg rebase --rev '42:: - author(Babar)'
- rebase a set of revision were multiple roots are later merged
hg rebase --rev '(18+42)::'
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Thu, 17 Jan 2013 00:35:01 +0100 |
parents | 1a00c8451640 |
children | 55aff0c2b73c |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Wed Jan 16 05:21:11 2013 +0100 +++ b/tests/test-rebase-obsolete.t Thu Jan 17 00:35:01 2013 +0100 @@ -306,3 +306,26 @@ +Test multiple root handling +------------------------------------ + + $ hg rebase --dest 4 --rev '7+11+9' + $ hg log -G + @ 14:00891d85fcfc C + | + | o 13:102b4c1d889b D + |/ + | o 12:bfe264faf697 H + |/ + | o 10:7c6027df6a99 B + | | + | x 7:02de42196ebe H + | | + +---o 6:eea13746799a G + | |/ + | o 5:24b6387c8c8c F + | | + o | 4:9520eea781bc E + |/ + o 0:cd010b8cd998 A +