Mercurial > hg
comparison tests/test-bookmarks-pushpull.t @ 22659:798185707833
pull: merge bookmark updates and imports
We do all the things in one go now, updating existing bookmark, adding new ones,
and overwriting the ones explicitly specified for --bookmark. This impacts the
tests by removing some duplicated or unnecessary output.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sun, 28 Sep 2014 14:07:56 -0700 |
| parents | b901645a8784 |
| children | fab9dda0f2a3 |
comparison
equal
deleted
inserted
replaced
| 22658:a8f0d8e4c80a | 22659:798185707833 |
|---|---|
| 59 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 | 59 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
| 60 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 | 60 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
| 61 $ hg pull -B X ../a | 61 $ hg pull -B X ../a |
| 62 pulling from ../a | 62 pulling from ../a |
| 63 no changes found | 63 no changes found |
| 64 importing bookmark X | |
| 65 $ hg bookmark | 64 $ hg bookmark |
| 66 X 0:4e3505fd9583 | 65 X 0:4e3505fd9583 |
| 67 * Y 0:4e3505fd9583 | 66 * Y 0:4e3505fd9583 |
| 68 Z 0:4e3505fd9583 | 67 Z 0:4e3505fd9583 |
| 69 | 68 |
| 371 divergent bookmark @ stored as @1 | 370 divergent bookmark @ stored as @1 |
| 372 divergent bookmark X stored as X@1 | 371 divergent bookmark X stored as X@1 |
| 373 adding remote bookmark Z | 372 adding remote bookmark Z |
| 374 adding remote bookmark foo | 373 adding remote bookmark foo |
| 375 adding remote bookmark foobar | 374 adding remote bookmark foobar |
| 376 importing bookmark Z | |
| 377 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks | 375 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks |
| 378 requesting all changes | 376 requesting all changes |
| 379 adding changesets | 377 adding changesets |
| 380 adding manifests | 378 adding manifests |
| 381 adding file changes | 379 adding file changes |