Mercurial > hg
comparison tests/test-bookmarks-pushpull.t @ 48244:b56858d85a7b
bookmarks: add a `ignore` variant of the bookmark mode
This new mode allow to disable bookmark exchange with some path (or all path).
Differential Revision: https://phab.mercurial-scm.org/D11677
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 15 Oct 2021 04:41:24 +0200 |
| parents | 76c071bba40d |
| children | 8c4881c07f57 |
comparison
equal
deleted
inserted
replaced
| 48243:76c071bba40d | 48244:b56858d85a7b |
|---|---|
| 521 @foo 000000000000 removed | 521 @foo 000000000000 removed |
| 522 X 0d2164f0ce0d added | 522 X 0d2164f0ce0d added |
| 523 X@foo 000000000000 removed | 523 X@foo 000000000000 removed |
| 524 foo 000000000000 removed | 524 foo 000000000000 removed |
| 525 foobar 000000000000 removed | 525 foobar 000000000000 removed |
| 526 $ hg incoming --bookmark -v ../a --config 'paths.*:bookmarks.mode=ignore' | |
| 527 comparing with ../a | |
| 528 bookmarks exchange disabled with this path | |
| 529 $ hg pull ../a --config 'paths.*:bookmarks.mode=ignore' | |
| 530 pulling from ../a | |
| 531 searching for changes | |
| 532 no changes found | |
| 533 $ hg book | |
| 534 @ 1:9b140be10808 | |
| 535 @foo 2:0d2164f0ce0d | |
| 536 X@foo 2:0d2164f0ce0d | |
| 537 Y 0:4e3505fd9583 | |
| 538 Z 2:0d2164f0ce0d | |
| 539 foo -1:000000000000 | |
| 540 * foobar 1:9b140be10808 | |
| 526 $ hg pull ../a --config 'paths.*:bookmarks.mode=mirror' | 541 $ hg pull ../a --config 'paths.*:bookmarks.mode=mirror' |
| 527 pulling from ../a | 542 pulling from ../a |
| 528 searching for changes | 543 searching for changes |
| 529 no changes found | 544 no changes found |
| 530 $ hg book | 545 $ hg book |