equal
deleted
inserted
replaced
488 @ 1:0d2164f0ce0d |
488 @ 1:0d2164f0ce0d |
489 * X 1:0d2164f0ce0d |
489 * X 1:0d2164f0ce0d |
490 Y 0:4e3505fd9583 |
490 Y 0:4e3505fd9583 |
491 Z 1:0d2164f0ce0d |
491 Z 1:0d2164f0ce0d |
492 |
492 |
|
493 mirroring bookmarks |
|
494 |
|
495 $ hg book |
|
496 @ 1:9b140be10808 |
|
497 @foo 2:0d2164f0ce0d |
|
498 X 1:9b140be10808 |
|
499 X@foo 2:0d2164f0ce0d |
|
500 Y 0:4e3505fd9583 |
|
501 Z 2:0d2164f0ce0d |
|
502 foo -1:000000000000 |
|
503 * foobar 1:9b140be10808 |
|
504 $ cp .hg/bookmarks .hg/bookmarks.bak |
|
505 $ hg book -d X |
|
506 $ hg pull ../a --config bookmarks.mirror=true |
|
507 pulling from ../a |
|
508 searching for changes |
|
509 no changes found |
|
510 $ hg book |
|
511 @ 2:0d2164f0ce0d |
|
512 X 2:0d2164f0ce0d |
|
513 Y 0:4e3505fd9583 |
|
514 Z 2:0d2164f0ce0d |
|
515 $ mv .hg/bookmarks.bak .hg/bookmarks |
|
516 |
493 explicit pull should overwrite the local version (issue4439) |
517 explicit pull should overwrite the local version (issue4439) |
494 |
518 |
495 $ hg update -r X |
519 $ hg update -r X |
496 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
520 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
497 (activating bookmark X) |
521 (activating bookmark X) |