Mercurial > evolve

diff tests/test-exchange-C1.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 528c066cd51c
children 778afb036245
line wrap: on
line diff
--- a/tests/test-exchange-C1.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-C1.t	Wed Aug 27 18:59:11 2014 +0200
@@ -70,7 +70,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 2 obsolescence markers (177 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -82,8 +82,7 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   ## post pull state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -110,7 +109,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 2 obsolescence markers (177 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -123,8 +122,7 @@
   pulling from main
   searching for changes
   no changes found
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   ## post pull state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}