Mercurial > hg-stable
diff tests/test-rebase-scenario-global.t @ 15132:81f76098211e
rebase: allow rebase to ancestor (issue3010)
We only deny rebasing onto direct parent. Thanks to the ancestor argument of
merge. the "implementation" of this feature only consist in loosing the check
and imply detach when rebasing on ancestor.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Mon, 19 Sep 2011 16:57:13 +0200 |
parents | 624e5ce615ec |
children | 3bfdfefea2fc |
line wrap: on
line diff
--- a/tests/test-rebase-scenario-global.t Sun Sep 18 19:59:33 2011 -0400 +++ b/tests/test-rebase-scenario-global.t Mon Sep 19 16:57:13 2011 +0200 @@ -212,7 +212,7 @@ $ cd a7 $ hg rebase -s 6 -d 5 - abort: source is descendant of destination + abort: source is a child of destination [255] F onto G - rebase onto a descendant: @@ -248,3 +248,25 @@ nothing to rebase [1] +C onto A - rebase onto an ancestor: + + $ hg rebase -d 0 -s 2 + saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg + $ hg tglog + @ 7: 'D' + | + o 6: 'C' + | + | o 5: 'H' + | | + | | o 4: 'G' + | |/| + | o | 3: 'F' + |/ / + | o 2: 'E' + |/ + | o 1: 'B' + |/ + o 0: 'A' + +