equal
deleted
inserted
replaced
363 a@ 2:db815d6d32e6 |
363 a@ 2:db815d6d32e6 |
364 x y 2:db815d6d32e6 |
364 x y 2:db815d6d32e6 |
365 $ hg clone . cloned-bookmarks |
365 $ hg clone . cloned-bookmarks |
366 updating to branch default |
366 updating to branch default |
367 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
367 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
368 active bookmark: @ |
368 $ hg -R cloned-bookmarks bookmarks |
369 $ hg -R cloned-bookmarks bookmarks |
369 * @ 2:db815d6d32e6 |
370 * @ 2:db815d6d32e6 |
370 X2 1:925d80f479bb |
371 X2 1:925d80f479bb |
371 Y 2:db815d6d32e6 |
372 Y 2:db815d6d32e6 |
372 Z 2:db815d6d32e6 |
373 Z 2:db815d6d32e6 |
381 adding manifests |
382 adding manifests |
382 adding file changes |
383 adding file changes |
383 added 3 changesets with 3 changes to 3 files (+1 heads) |
384 added 3 changesets with 3 changes to 3 files (+1 heads) |
384 updating to branch default |
385 updating to branch default |
385 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
386 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
387 active bookmark: @ |
386 $ hg -R cloned-bookmarks-pull bookmarks |
388 $ hg -R cloned-bookmarks-pull bookmarks |
387 * @ 2:db815d6d32e6 |
389 * @ 2:db815d6d32e6 |
388 X2 1:925d80f479bb |
390 X2 1:925d80f479bb |
389 Y 2:db815d6d32e6 |
391 Y 2:db815d6d32e6 |
390 Z 2:db815d6d32e6 |
392 Z 2:db815d6d32e6 |
425 test clone with update to a bookmark |
427 test clone with update to a bookmark |
426 |
428 |
427 $ hg clone -u Z . cloned-bookmarks-update |
429 $ hg clone -u Z . cloned-bookmarks-update |
428 updating to branch default |
430 updating to branch default |
429 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
431 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
432 active bookmark: Z |
430 $ hg -R cloned-bookmarks-update bookmarks |
433 $ hg -R cloned-bookmarks-update bookmarks |
431 X2 1:925d80f479bb |
434 X2 1:925d80f479bb |
432 Y 2:db815d6d32e6 |
435 Y 2:db815d6d32e6 |
433 * Z 2:db815d6d32e6 |
436 * Z 2:db815d6d32e6 |
434 x y 2:db815d6d32e6 |
437 x y 2:db815d6d32e6 |