Mercurial > hg-stable
diff tests/test-rebase-obsolete.t @ 18447:7159426c8d13
rebase: properly handle unrebased revision between rebased one
With rebase taking multiple roots it is possible to have revision in the "rebase
domain" not rebased themself. We do not want rebased revision above them to be
detached. We want such revision to be rebased on the nearest rebased ancestors.
This allows to preserve the topology of the rebase set as much a possible
To achieve this we introduce a new state `revignored` which informs
`defineparents` of the situation.
The test in `test-rebase-obsolete.t` was actually wrote and his now fixed.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 18 Jan 2013 23:41:48 +0100 |
| parents | 55aff0c2b73c |
| children | 37100f30590f |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Fri Jan 18 23:21:32 2013 +0100 +++ b/tests/test-rebase-obsolete.t Fri Jan 18 23:41:48 2013 +0100 @@ -366,11 +366,11 @@ $ hg rebase --dest 4 --rev '7+11+9' $ hg log -G - @ 14:00891d85fcfc C + @ 14:1e8370e38cca C | | o 13:102b4c1d889b D - |/ - | o 12:bfe264faf697 H + | | + o | 12:bfe264faf697 H |/ | o 10:7c6027df6a99 B | |