Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-collapse.t @ 15267:3bfdfefea2fc
rebase: use revset as soon as possible in internal logic
The buildstate function now take a set of revs. Logic related to --source and
--base option have been moved in the main rebase function.
In the process this fixes a bug where the wrong source changeset might be pick.
This explain the changes in hgext/rebase.py
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Sat, 15 Oct 2011 19:07:51 +0200 |
| parents | b9daa5b7a3af |
| children | 41885892796e |
line wrap: on
line diff
--- a/tests/test-rebase-collapse.t Sat Oct 15 10:20:08 2011 -0500 +++ b/tests/test-rebase-collapse.t Sat Oct 15 19:07:51 2011 +0200 @@ -74,12 +74,12 @@ $ cd .. -Rebasing G onto H: +Rebasing E onto H: $ hg clone -q -u . a a2 $ cd a2 - $ hg rebase --base 6 --collapse + $ hg rebase --source 4 --collapse saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @@ -115,7 +115,7 @@ abort: message can only be specified with collapse [255] - $ hg rebase --base 6 --collapse -m 'custom message' + $ hg rebase --source 4 --collapse -m 'custom message' saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) $ hg tglog