diff -r b398e9c2dbd1 -r ce5ea6f6a700 tests/test-uncommit.t
--- a/tests/test-uncommit.t	Wed Jul 11 13:59:06 2012 -0400
+++ b/tests/test-uncommit.t	Sat Jul 14 17:58:08 2012 +0200
@@ -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