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-tutorial.t
changeset 823 9aa20585e158
parent 817 c2bf0eb727f1
child 865 5c40b2a4b52f 
--- a/tests/test-tutorial.t	Fri Feb 28 00:55:34 2014 -0800
+++ b/tests/test-tutorial.t	Fri Feb 28 13:25:34 2014 -0800
@@ -224,6 +224,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  OBSEXC: pull obsolescence markers
+  OBSEXC: DONE
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 I now have a new heads. Note that this remote head is immutable
@@ -514,6 +516,10 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  OBSEXC: pull obsolescence markers
+  OBSEXC: merging obsolescence markers (560 bytes)
+  OBSEXC: 1 markers added
+  OBSEXC: DONE
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (public): bathroom stuff
@@ -570,6 +576,10 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  OBSEXC: pull obsolescence markers
+  OBSEXC: merging obsolescence markers (560 bytes)
+  OBSEXC: 1 markers added
+  OBSEXC: DONE
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (draft): bathroom stuff
@@ -629,6 +639,10 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  OBSEXC: pull obsolescence markers
+  OBSEXC: merging obsolescence markers (560 bytes)
+  OBSEXC: 0 markers added
+  OBSEXC: DONE
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
 
@@ -730,6 +744,10 @@
   pulling from $TESTTMP/local
   searching for changes
   no changes found
+  OBSEXC: pull obsolescence markers
+  OBSEXC: merging obsolescence markers (803 bytes)
+  OBSEXC: 0 markers added
+  OBSEXC: DONE
   working directory parent is obsolete!
 
 now let's see where we are, and update to the successor
@@ -759,6 +777,10 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  OBSEXC: pull obsolescence markers
+  OBSEXC: merging obsolescence markers (803 bytes)
+  OBSEXC: 0 markers added
+  OBSEXC: DONE
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  99f039c5ec9e (draft): SPAM SPAM SPAM
evolve