equal
deleted
inserted
replaced
71 $ mkcommit fuz_b |
71 $ mkcommit fuz_b |
72 $ mkcommit fuz_c |
72 $ mkcommit fuz_c |
73 $ hg up 'desc(fuz_a)' |
73 $ hg up 'desc(fuz_a)' |
74 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
74 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
75 $ hg commit --amend --message 'fuz1_a' |
75 $ hg commit --amend --message 'fuz1_a' |
76 2 new orphan changesets |
|
77 |
76 |
78 A topic with multiple heads |
77 A topic with multiple heads |
79 |
78 |
80 $ hg up 'desc(base_e)' |
79 $ hg up 'desc(base_e)' |
81 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
80 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
90 $ mkcommit bar_d |
89 $ mkcommit bar_d |
91 $ mkcommit bar_e |
90 $ mkcommit bar_e |
92 $ hg up 'desc(bar_d)' |
91 $ hg up 'desc(bar_d)' |
93 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
94 $ hg commit --amend --message 'bar1_d' |
93 $ hg commit --amend --message 'bar1_d' |
95 1 new orphan changesets |
|
96 |
94 |
97 topic 'foo' on the multi headed branch |
95 topic 'foo' on the multi headed branch |
98 |
96 |
99 $ hg up 'desc(lake_a)' |
97 $ hg up 'desc(lake_a)' |
100 1 files updated, 0 files merged, 7 files removed, 0 files unresolved |
98 1 files updated, 0 files merged, 7 files removed, 0 files unresolved |
121 | |
119 | |
122 o add foo_a (lake) [foo] |
120 o add foo_a (lake) [foo] |
123 | |
121 | |
124 | o bar1_d (default) [bar] |
122 | o bar1_d (default) [bar] |
125 | | |
123 | | |
126 | | * add bar_e (default) [bar] |
124 | | o add bar_e (default) [bar] |
127 | | | |
125 | | | |
128 | | x add bar_d (default) [bar] |
126 | | x add bar_d (default) [bar] |
129 | |/ |
127 | |/ |
130 | | o add bar_c (default) [bar] |
128 | | o add bar_c (default) [bar] |
131 | |/ |
129 | |/ |
133 | | |
131 | | |
134 | o add bar_a (default) [bar] |
132 | o add bar_a (default) [bar] |
135 | | |
133 | | |
136 | | o fuz1_a (default) [fuz] |
134 | | o fuz1_a (default) [fuz] |
137 | | | |
135 | | | |
138 | | | * add fuz_c (default) [fuz] |
136 | | | o add fuz_c (default) [fuz] |
139 | | | | |
137 | | | | |
140 | | | * add fuz_b (default) [fuz] |
138 | | | o add fuz_b (default) [fuz] |
141 | | | | |
139 | | | | |
142 | | | x add fuz_a (default) [fuz] |
140 | | | x add fuz_a (default) [fuz] |
143 | | |/ |
141 | | |/ |
144 | | | o add baz_b (default) [baz] |
142 | | | o add baz_b (default) [baz] |
145 | | | | |
143 | | | | |