equal
deleted
inserted
replaced
391 2 |
391 2 |
392 branch: default |
392 branch: default |
393 bookmarks: *Z Y x y |
393 bookmarks: *Z Y x y |
394 commit: (clean) |
394 commit: (clean) |
395 update: 1 new changesets, 2 branch heads (merge) |
395 update: 1 new changesets, 2 branch heads (merge) |
|
396 phases: 3 draft (draft) |
396 |
397 |
397 test id |
398 test id |
398 |
399 |
399 $ hg id |
400 $ hg id |
400 db815d6d32e6 tip Y/Z/x y |
401 db815d6d32e6 tip Y/Z/x y |
536 2 |
537 2 |
537 branch: default |
538 branch: default |
538 bookmarks: *Z Y x y |
539 bookmarks: *Z Y x y |
539 commit: 1 added, 1 unknown (new branch head) |
540 commit: 1 added, 1 unknown (new branch head) |
540 update: 2 new changesets (update) |
541 update: 2 new changesets (update) |
|
542 phases: 5 draft (draft) |
541 $ hg update |
543 $ hg update |
542 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
544 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
543 updating bookmark Z |
545 updating bookmark Z |
544 $ hg bookmarks |
546 $ hg bookmarks |
545 X2 1:925d80f479bb |
547 X2 1:925d80f479bb |