tests/test-obsolete.t
changeset 479 b63da0fb8ee5
parent 473 1f8f8dd75d18
child 480 cd1d5b7308be
--- a/tests/test-obsolete.t	Thu Aug 23 12:23:00 2012 +0200
+++ b/tests/test-obsolete.t	Thu Aug 23 12:23:34 2012 +0200
@@ -375,6 +375,8 @@
   branch: default
   commit: 1 deleted, 2 unknown (clean)
   update: 4 new changesets, 4 branch heads (merge)
+  unstable: 1 changesets
+  conflicting: 1 changesets
   $ qlog
   6
   - 909a0fb57e5d
@@ -631,6 +633,7 @@
   branch: default
   commit: (clean)
   update: 9 new changesets, 9 branch heads (merge)
+  latecomer: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   $ hg log -r 'conflicting()'
   changeset:   14:50f11e5e3a63