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 823 9aa20585e158
parent 817 c2bf0eb727f1
child 942 010c7e4aa820 
--- a/tests/test-obsolete.t	Fri Feb 28 00:55:34 2014 -0800
+++ b/tests/test-obsolete.t	Fri Feb 28 13:25:34 2014 -0800
@@ -285,7 +285,11 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  \(run 'hg heads( \.)?' to see heads, 'hg merge' to merge\) (re)
+  OBSEXC: pull obsolescence markers
+  OBSEXC: merging obsolescence markers (245 bytes)
+  OBSEXC: 1 markers added
+  OBSEXC: DONE
+  (run 'hg heads' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
   - 909a0fb57e5d
@@ -374,7 +378,11 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  \(run 'hg heads( \.)?' to see heads, 'hg merge' to merge\) (re)
+  OBSEXC: pull obsolescence markers
+  OBSEXC: merging obsolescence markers (306 bytes)
+  OBSEXC: 1 markers added
+  OBSEXC: DONE
+  (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
   $ qlog
evolve