Mercurial > evolve
diff tests/test-obsolete.t @ 571:31efc36f3aac stable
rebase: warn about troubles created by rebase
The previous order created obsolete marker after checking for new troubles
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Wed, 19 Sep 2012 17:30:07 +0200 |
| parents | 1c45a07dda51 |
| children | dc107acd0bd2 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Wed Sep 19 14:53:24 2012 +0200 +++ b/tests/test-obsolete.t Wed Sep 19 17:30:07 2012 +0200 @@ -498,6 +498,7 @@ nothing to rebase [1] $ hg rebase -b 3 -d 4 --traceback + 2 new conflicting changesets $ hg log -G -r 'not extinct()' --template='{rev} - {node|short}\n' @ 11 - 9468a5f5d8b2 |