Mercurial > hg
comparison tests/test-bookmarks-pushpull.t @ 17882:36ed69d4593d stable
clone: show status "updating to bookmark @"
if bookmark @ is not on the default branch, we show
updating to bookmark @ on branch <name>
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Mon, 29 Oct 2012 14:02:30 +0100 |
| parents | 7d4e98bf114d |
| children | 7ca534f31a83 |
comparison
equal
deleted
inserted
replaced
| 17881:603d4fbad36d | 17882:36ed69d4593d |
|---|---|
| 333 requesting all changes | 333 requesting all changes |
| 334 adding changesets | 334 adding changesets |
| 335 adding manifests | 335 adding manifests |
| 336 adding file changes | 336 adding file changes |
| 337 added 5 changesets with 5 changes to 3 files (+2 heads) | 337 added 5 changesets with 5 changes to 3 files (+2 heads) |
| 338 updating to branch default | 338 updating to bookmark @ |
| 339 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 339 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 340 $ hg -R cloned-bookmarks bookmarks | 340 $ hg -R cloned-bookmarks bookmarks |
| 341 * @ 1:9b140be10808 | 341 * @ 1:9b140be10808 |
| 342 X 1:9b140be10808 | 342 X 1:9b140be10808 |
| 343 Y 4:c922c0139ca0 | 343 Y 4:c922c0139ca0 |
| 353 requesting all changes | 353 requesting all changes |
| 354 adding changesets | 354 adding changesets |
| 355 adding manifests | 355 adding manifests |
| 356 adding file changes | 356 adding file changes |
| 357 added 5 changesets with 5 changes to 3 files (+2 heads) | 357 added 5 changesets with 5 changes to 3 files (+2 heads) |
| 358 updating to branch default | 358 updating to bookmark @ |
| 359 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 359 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 360 $ cd addmarks | 360 $ cd addmarks |
| 361 $ echo foo > foo | 361 $ echo foo > foo |
| 362 $ hg add foo | 362 $ hg add foo |
| 363 $ hg commit -m 'add foo' | 363 $ hg commit -m 'add foo' |