Mercurial > evolve

diff tests/test-exchange-B5.t @ 1093:a49f2e7a2755

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsexch: respect todosteps when using the old push
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 27 Aug 2014 18:59:11 +0200
parents cdd22a5e5ef1
children 778afb036245
line wrap: on
line diff
--- a/tests/test-exchange-B5.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-B5.t	Wed Aug 27 18:59:11 2014 +0200
@@ -91,7 +91,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 2 changes to 2 files
-  pushing 2 obsolescence markers (153 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -107,8 +107,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   (run 'hg update' to get a working copy)
   1 new unstable changesets
   ## post pull state
@@ -141,7 +140,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 2 changes to 2 files
-  pushing 2 obsolescence markers (153 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -157,8 +156,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   (run 'hg update' to get a working copy)
   1 new unstable changesets
   ## post pull state