##// END OF EJS Templates
test: use bundle2 for exchange in test-bookmark-pushpull...
Pierre-Yves David -
r25352:ddf99471 default
parent child Browse files
Show More
@@ -7,6 +7,9 b''
7 > publish=False
7 > publish=False
8 > [experimental]
8 > [experimental]
9 > evolution=createmarkers,exchange
9 > evolution=createmarkers,exchange
10 > # drop me once bundle2 is the default,
11 > # added to get test change early.
12 > bundle2-exp = True
10 > EOF
13 > EOF
11
14
12 initialize
15 initialize
@@ -274,9 +277,9 b' update a bookmark in the middle of a cli'
274 $ hg pull
277 $ hg pull
275 pulling from $TESTTMP/pull-race (glob)
278 pulling from $TESTTMP/pull-race (glob)
276 searching for changes
279 searching for changes
277 adding changesets
278 adding f3
280 adding f3
279 committed in pull-race
281 committed in pull-race
282 adding changesets
280 adding manifests
283 adding manifests
281 adding file changes
284 adding file changes
282 added 1 changesets with 1 changes to 1 files
285 added 1 changesets with 1 changes to 1 files
@@ -368,6 +371,7 b' Update to a successor works'
368 remote: adding manifests
371 remote: adding manifests
369 remote: adding file changes
372 remote: adding file changes
370 remote: added 2 changesets with 2 changes to 1 files (+1 heads)
373 remote: added 2 changesets with 2 changes to 1 files (+1 heads)
374 remote: 2 new obsolescence markers
371 updating bookmark Y
375 updating bookmark Y
372 $ hg -R ../a book
376 $ hg -R ../a book
373 @ 1:0d2164f0ce0d
377 @ 1:0d2164f0ce0d
@@ -436,6 +440,7 b' hgweb'
436 adding manifests
440 adding manifests
437 adding file changes
441 adding file changes
438 added 5 changesets with 5 changes to 3 files (+2 heads)
442 added 5 changesets with 5 changes to 3 files (+2 heads)
443 2 new obsolescence markers
439 updating to bookmark @
444 updating to bookmark @
440 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
445 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
441 $ hg -R cloned-bookmarks bookmarks
446 $ hg -R cloned-bookmarks bookmarks
@@ -571,6 +576,7 b' bookmark, not all outgoing changes:'
571 adding manifests
576 adding manifests
572 adding file changes
577 adding file changes
573 added 5 changesets with 5 changes to 3 files (+2 heads)
578 added 5 changesets with 5 changes to 3 files (+2 heads)
579 2 new obsolescence markers
574 updating to bookmark @
580 updating to bookmark @
575 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
581 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
576 $ cd addmarks
582 $ cd addmarks
General Comments 0
You need to be logged in to leave comments. Login now