Mercurial > hg-stable
changeset 25352:ddf99471e023
test: use bundle2 for exchange in test-bookmark-pushpull
This lets us adapt to changes in obsmarkers exchange output earlier.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 27 May 2015 12:49:32 -0700 |
| parents | 97513f9d2e38 |
| children | a76f9fc18ebd |
| files | tests/test-bookmarks-pushpull.t |
| diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t Wed May 27 04:21:39 2015 -0700 +++ b/tests/test-bookmarks-pushpull.t Wed May 27 12:49:32 2015 -0700 @@ -7,6 +7,9 @@ > publish=False > [experimental] > evolution=createmarkers,exchange + > # drop me once bundle2 is the default, + > # added to get test change early. + > bundle2-exp = True > EOF initialize @@ -274,9 +277,9 @@ $ 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 @@ -368,6 +371,7 @@ 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 @@ -436,6 +440,7 @@ 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 @@ -571,6 +576,7 @@ 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