Patchwork [03,of,10,main-line-of-work,(some,two,digits,more,patches,to,go)] test: use bundle2 for exchange in test-bookmark-pushpull

login
register
mail settings
Submitter Pierre-Yves David
Date May 29, 2015, 4:53 p.m.
Message ID <d454cc072d583c2d1db4.1432918384@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/9363/
State Accepted
Headers show

Comments

Pierre-Yves David - May 29, 2015, 4:53 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1432756172 25200
#      Wed May 27 12:49:32 2015 -0700
# Node ID d454cc072d583c2d1db481c846131cba70f35bef
# Parent  7c2fb277848b4359835c92ccd9d3b888d2afd4a0
test: use bundle2 for exchange in test-bookmark-pushpull

This let use adapt to change in obsmarkers exchange output earlier.

Patch

diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -5,10 +5,13 @@ 
   > logtemplate={rev}:{node|short} {desc|firstline}
   > [phases]
   > publish=False
   > [experimental]
   > evolution=createmarkers,exchange
+  > # drop me once bundle2 is the default,
+  > # added to get test change early.
+  > bundle2-exp = True
   > EOF
 
 initialize
 
   $ hg init a
@@ -272,13 +275,13 @@  update a bookmark in the middle of a cli
   > EOF
   $ cd ../pull-race2
   $ hg pull
   pulling from $TESTTMP/pull-race (glob)
   searching for changes
-  adding changesets
   adding f3
   committed in pull-race
+  adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   updating bookmark Y
   (run 'hg update' to get a working copy)
@@ -366,10 +369,11 @@  Update to a successor works
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 2 changes to 1 files (+1 heads)
+  remote: 2 new obsolescence markers
   updating bookmark Y
   $ hg -R ../a book
      @                         1:0d2164f0ce0d
    * X                         1:0d2164f0ce0d
      Y                         5:c922c0139ca0
@@ -434,10 +438,11 @@  hgweb
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 3 files (+2 heads)
+  2 new obsolescence markers
   updating to bookmark @
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R cloned-bookmarks bookmarks
    * @                         1:9b140be10808
      X                         1:9b140be10808
@@ -569,10 +574,11 @@  bookmark, not all outgoing changes:
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 3 files (+2 heads)
+  2 new obsolescence markers
   updating to bookmark @
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd addmarks
   $ echo foo > foo
   $ hg add foo