Mercurial > hg > mutable-history
diff tests/test-uncommit.t @ 359:43f79983f638
merge with conflicting detection
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Wed, 11 Jul 2012 15:20:22 +0200 (2012-07-11) |
| parents | f4302a2079f4 56d4c6207ef9 |
| children | cdcdedc532b7 |
line wrap: on
line diff
--- a/tests/test-uncommit.t +++ b/tests/test-uncommit.t @@ -242,6 +242,7 @@ Working directory parent is obsolete $ hg --config extensions.purge= purge $ hg uncommit -I 'set:added() and e' + 2 new conflictings changesets $ hg st --copies A e $ hg st --copies --change . @@ -285,6 +286,7 @@ Working directory parent is obsolete $ hg --config extensions.purge= purge $ hg uncommit --all -X e + 1 new conflictings changesets $ hg st --copies M b M d