Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-obsolete.t
changeset 79 9906560f585e
parent 75 d7b11772f0b5
child 80 5d029a358252 
--- a/tests/test-obsolete.t	Wed Sep 14 17:55:17 2011 +0200
+++ b/tests/test-obsolete.t	Wed Sep 14 19:20:38 2011 +0200
@@ -67,6 +67,7 @@
   3
   - 0d3f46688ccc
   $ hg up 3 -q
+  Working directory parent is obsolete
   $ mkcommit d # 5 (on 3)
   $ qlog -r 'obsolete()'
   3
@@ -98,6 +99,7 @@
   0
   - 1f0dee641bb7
   $ hg up 3 -q
+  Working directory parent is obsolete
   $ mkcommit obsol_d # 6
   created new head
   $ hg debugobsolete 6 5
@@ -136,7 +138,8 @@
   $ qlog -R ../other-new -r 'obsolete()'
   2
   - 0d3f46688ccc
-  $ hg up -q .^
+  $ hg up -q .^ # 3
+  Working directory parent is obsolete
   $ mkcommit "obsol_d'" # 7
   created new head
   $ hg debugobsolete 7 6
@@ -218,7 +221,8 @@
 
 Test rollback support
 
-  $ hg up .^ -q
+  $ hg up .^ -q # 3
+  Working directory parent is obsolete
   $ mkcommit "obsol_d''"
   created new head
   $ hg debugobsolete 8 7
evolve