equal
deleted
inserted
replaced
73 $ hg up -C 4 |
73 $ hg up -C 4 |
74 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
74 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
75 $ echo f > f |
75 $ echo f > f |
76 $ hg commit -Am "f" |
76 $ hg commit -Am "f" |
77 adding f |
77 adding f |
|
78 $ hg bookmarks -r 4 "e@diverged" |
|
79 $ hg up -q -C "e@diverged" |
|
80 $ hg merge |
|
81 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
82 (branch merge, don't forget to commit) |
|
83 $ hg parents |
|
84 changeset: 4:a0546fcfe0fb |
|
85 bookmark: e@diverged |
|
86 user: test |
|
87 date: Thu Jan 01 00:00:00 1970 +0000 |
|
88 summary: d |
|
89 |
|
90 changeset: 5:26bee9c5bcf3 |
|
91 bookmark: e |
|
92 parent: 3:b8f96cf4688b |
|
93 user: test |
|
94 date: Thu Jan 01 00:00:00 1970 +0000 |
|
95 summary: e |
|
96 |
78 $ hg up -C e |
97 $ hg up -C e |
79 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
98 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
80 $ hg bookmarks -r 4 "e@diverged" |
|
81 $ hg bookmarks |
99 $ hg bookmarks |
82 b 1:d2ae7f538514 |
100 b 1:d2ae7f538514 |
83 c 3:b8f96cf4688b |
101 c 3:b8f96cf4688b |
84 * e 5:26bee9c5bcf3 |
102 * e 5:26bee9c5bcf3 |
85 e@diverged 4:a0546fcfe0fb |
103 e@diverged 4:a0546fcfe0fb |