Mercurial > hg
diff tests/test-bookmarks-pushpull.t @ 48243:76c071bba40d
bookmarks: add support for `mirror` mode to `incoming`
This is more consistent.
Differential Revision: https://phab.mercurial-scm.org/D11676
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 15 Oct 2021 04:25:58 +0200 |
| parents | 4d2ab365699e |
| children | b56858d85a7b |
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t Fri Oct 15 03:49:05 2021 +0200 +++ b/tests/test-bookmarks-pushpull.t Fri Oct 15 04:25:58 2021 +0200 @@ -503,6 +503,26 @@ * foobar 1:9b140be10808 $ cp .hg/bookmarks .hg/bookmarks.bak $ hg book -d X + $ hg incoming --bookmark -v ../a + comparing with ../a + searching for changed bookmarks + @ 0d2164f0ce0d diverged + X 0d2164f0ce0d added + $ hg incoming --bookmark -v ../a --config 'paths.*:bookmarks.mode=babar' + (paths.*:bookmarks.mode has unknown value: "babar") + comparing with ../a + searching for changed bookmarks + @ 0d2164f0ce0d diverged + X 0d2164f0ce0d added + $ hg incoming --bookmark -v ../a --config 'paths.*:bookmarks.mode=mirror' + comparing with ../a + searching for changed bookmarks + @ 0d2164f0ce0d changed + @foo 000000000000 removed + X 0d2164f0ce0d added + X@foo 000000000000 removed + foo 000000000000 removed + foobar 000000000000 removed $ hg pull ../a --config 'paths.*:bookmarks.mode=mirror' pulling from ../a searching for changes