Mercurial > hg
comparison tests/test-rebase-scenario-global.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 | 81f76098211e |
| children | 6cb6064f1d50 |
comparison
equal
deleted
inserted
replaced
| 15266:8bea39ca9acb | 15267:3bfdfefea2fc |
|---|---|
| 210 | 210 |
| 211 $ hg clone -q -u . a a7 | 211 $ hg clone -q -u . a a7 |
| 212 $ cd a7 | 212 $ cd a7 |
| 213 | 213 |
| 214 $ hg rebase -s 6 -d 5 | 214 $ hg rebase -s 6 -d 5 |
| 215 abort: source is a child of destination | 215 nothing to rebase |
| 216 [255] | 216 [1] |
| 217 | 217 |
| 218 F onto G - rebase onto a descendant: | 218 F onto G - rebase onto a descendant: |
| 219 | 219 |
| 220 $ hg rebase -s 5 -d 6 | 220 $ hg rebase -s 5 -d 6 |
| 221 abort: source is ancestor of destination | 221 abort: source is ancestor of destination |