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 1038 45c4739e85dc
parent 1037 bddee73b361e
child 1039 657a38cd2ae3 
--- a/tests/test-obsolete.t	Fri Aug 08 17:34:22 2014 -0700
+++ b/tests/test-obsolete.t	Fri Aug 08 17:40:01 2014 -0700
@@ -273,6 +273,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
+  pull obsolescence markers
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
@@ -362,6 +363,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
+  pull obsolescence markers
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
evolve