# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1406495385 -7200
# Node ID cdd22a5e5ef1764443f5f2bfdc81fda7988f36ac
# Parent  528c066cd51cbfcc244707cc352c0a3393492ef4
enable bundle2

diff -r 528c066cd51c -r cdd22a5e5ef1 tests/_exc-util.sh
--- a/tests/_exc-util.sh	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/_exc-util.sh	Sun Jul 27 23:09:45 2014 +0200
@@ -13,6 +13,7 @@
 
 [experimental]
 verbose-obsolescence-exchange=false
+bundle2-exp=true
 
 [alias]
 debugobsolete=debugobsolete -d '0 0'
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-A1.t
--- a/tests/test-exchange-A1.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-A1.t	Sun Jul 27 23:09:45 2014 +0200
@@ -68,10 +68,10 @@
   ## pushing "A" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
@@ -113,10 +113,10 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
@@ -217,10 +217,10 @@
   ## pushing "B" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 2 changesets with 2 changes to 2 files
   pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
@@ -259,10 +259,10 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 2 changesets with 2 changes to 2 files
   pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-A2.t
--- a/tests/test-exchange-A2.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-A2.t	Sun Jul 27 23:09:45 2014 +0200
@@ -76,10 +76,10 @@
   ## pushing "A" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-A3.t
--- a/tests/test-exchange-A3.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-A3.t	Sun Jul 27 23:09:45 2014 +0200
@@ -88,10 +88,10 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
@@ -187,10 +187,10 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files (+1 heads)
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-A4.t
--- a/tests/test-exchange-A4.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-A4.t	Sun Jul 27 23:09:45 2014 +0200
@@ -81,10 +81,10 @@
   ## pushing "B" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 2 changesets with 2 changes to 2 files
   pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-A5.t
--- a/tests/test-exchange-A5.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-A5.t	Sun Jul 27 23:09:45 2014 +0200
@@ -88,10 +88,10 @@
   ## pushing "B1" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-B1.t
--- a/tests/test-exchange-B1.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-B1.t	Sun Jul 27 23:09:45 2014 +0200
@@ -67,10 +67,10 @@
   ## pushing "A" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 1 obsolescence markers (89 bytes)
   ## post push state
   # obstore: main
@@ -109,10 +109,10 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 1 obsolescence markers (89 bytes)
   ## post push state
   # obstore: main
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-B3.t
--- a/tests/test-exchange-B3.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-B3.t	Sun Jul 27 23:09:45 2014 +0200
@@ -75,10 +75,10 @@
   ## pushing "A" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   ## post push state
   # obstore: main
   e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-B4.t
--- a/tests/test-exchange-B4.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-B4.t	Sun Jul 27 23:09:45 2014 +0200
@@ -41,17 +41,17 @@
   $ hg push ../pushdest
   pushing to ../pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 2 changesets with 2 changes to 2 files
   $ hg push ../pulldest
   pushing to ../pulldest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 2 changesets with 2 changes to 2 files
   $ hg update -q 0
   $ mkcommit C
   created new head
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-B5.t
--- a/tests/test-exchange-B5.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-B5.t	Sun Jul 27 23:09:45 2014 +0200
@@ -87,10 +87,10 @@
   ## pushing "B" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 2 changesets with 2 changes to 2 files
   pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
@@ -137,10 +137,10 @@
   ## pushing "B" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 2 changesets with 2 changes to 2 files
   pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-C2.t
--- a/tests/test-exchange-C2.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-C2.t	Sun Jul 27 23:09:45 2014 +0200
@@ -76,10 +76,10 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
@@ -124,10 +124,10 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-D1.t
--- a/tests/test-exchange-D1.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-D1.t	Sun Jul 27 23:09:45 2014 +0200
@@ -70,10 +70,10 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
diff -r 528c066cd51c -r cdd22a5e5ef1 tests/test-exchange-D4.t
--- a/tests/test-exchange-D4.t	Fri Aug 29 11:56:16 2014 +0200
+++ b/tests/test-exchange-D4.t	Sun Jul 27 23:09:45 2014 +0200
@@ -85,10 +85,10 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
   pushing 2 obsolescence markers (129 bytes)
   ## post push state
   # obstore: main