Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
18423:5d6ee2494f63 | 18424:100fdc84670f |
---|---|
304 |/ | 304 |/ |
305 o 0:cd010b8cd998 A | 305 o 0:cd010b8cd998 A |
306 | 306 |
307 | 307 |
308 | 308 |
309 Test multiple root handling | |
310 ------------------------------------ | |
311 | |
312 $ hg rebase --dest 4 --rev '7+11+9' | |
313 $ hg log -G | |
314 @ 14:00891d85fcfc C | |
315 | | |
316 | o 13:102b4c1d889b D | |
317 |/ | |
318 | o 12:bfe264faf697 H | |
319 |/ | |
320 | o 10:7c6027df6a99 B | |
321 | | | |
322 | x 7:02de42196ebe H | |
323 | | | |
324 +---o 6:eea13746799a G | |
325 | |/ | |
326 | o 5:24b6387c8c8c F | |
327 | | | |
328 o | 4:9520eea781bc E | |
329 |/ | |
330 o 0:cd010b8cd998 A | |
331 |