equal
deleted
inserted
replaced
5 > logtemplate={rev}:{node|short} {desc|firstline} |
5 > logtemplate={rev}:{node|short} {desc|firstline} |
6 > [phases] |
6 > [phases] |
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 |
13 |
16 |
14 $ hg init a |
17 $ hg init a |
272 > EOF |
275 > EOF |
273 $ cd ../pull-race2 |
276 $ cd ../pull-race2 |
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 |
283 updating bookmark Y |
286 updating bookmark Y |
284 (run 'hg update' to get a working copy) |
287 (run 'hg update' to get a working copy) |
366 searching for changes |
369 searching for changes |
367 remote: adding changesets |
370 remote: adding changesets |
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 |
374 * X 1:0d2164f0ce0d |
378 * X 1:0d2164f0ce0d |
375 Y 5:c922c0139ca0 |
379 Y 5:c922c0139ca0 |
434 requesting all changes |
438 requesting all changes |
435 adding changesets |
439 adding changesets |
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 |
442 * @ 1:9b140be10808 |
447 * @ 1:9b140be10808 |
443 X 1:9b140be10808 |
448 X 1:9b140be10808 |
569 requesting all changes |
574 requesting all changes |
570 adding changesets |
575 adding changesets |
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 |
577 $ echo foo > foo |
583 $ echo foo > foo |
578 $ hg add foo |
584 $ hg add foo |