equal
deleted
inserted
replaced
501 Z 2:0d2164f0ce0d |
501 Z 2:0d2164f0ce0d |
502 foo -1:000000000000 |
502 foo -1:000000000000 |
503 * foobar 1:9b140be10808 |
503 * foobar 1:9b140be10808 |
504 $ cp .hg/bookmarks .hg/bookmarks.bak |
504 $ cp .hg/bookmarks .hg/bookmarks.bak |
505 $ hg book -d X |
505 $ hg book -d X |
|
506 $ hg incoming --bookmark -v ../a |
|
507 comparing with ../a |
|
508 searching for changed bookmarks |
|
509 @ 0d2164f0ce0d diverged |
|
510 X 0d2164f0ce0d added |
|
511 $ hg incoming --bookmark -v ../a --config 'paths.*:bookmarks.mode=babar' |
|
512 (paths.*:bookmarks.mode has unknown value: "babar") |
|
513 comparing with ../a |
|
514 searching for changed bookmarks |
|
515 @ 0d2164f0ce0d diverged |
|
516 X 0d2164f0ce0d added |
|
517 $ hg incoming --bookmark -v ../a --config 'paths.*:bookmarks.mode=mirror' |
|
518 comparing with ../a |
|
519 searching for changed bookmarks |
|
520 @ 0d2164f0ce0d changed |
|
521 @foo 000000000000 removed |
|
522 X 0d2164f0ce0d added |
|
523 X@foo 000000000000 removed |
|
524 foo 000000000000 removed |
|
525 foobar 000000000000 removed |
506 $ hg pull ../a --config 'paths.*:bookmarks.mode=mirror' |
526 $ hg pull ../a --config 'paths.*:bookmarks.mode=mirror' |
507 pulling from ../a |
527 pulling from ../a |
508 searching for changes |
528 searching for changes |
509 no changes found |
529 no changes found |
510 $ hg book |
530 $ hg book |