equal
deleted
inserted
replaced
133 |
133 |
134 $ hg next |
134 $ hg next |
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
136 [2] added c |
136 [2] added c |
137 $ hg next |
137 $ hg next |
138 no non-obsolete children |
138 no children |
139 [1] |
139 [1] |
140 $ hg prev |
140 $ hg prev |
141 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
141 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
142 [1] added b |
142 [1] added b |
143 |
143 |
144 some aspiring children |
144 some aspiring children |
145 |
145 |
146 $ hg amend -m 'added b (2)' |
146 $ hg amend -m 'added b (2)' |
147 1 new unstable changesets |
147 1 new unstable changesets |
148 $ hg next |
148 $ hg next |
149 no non-obsolete children |
149 no children |
150 [1] |
150 [1] |
151 $ hg evolve |
151 $ hg evolve |
152 move:[2] added c |
152 move:[2] added c |
153 atop:[3] added b (2) |
153 atop:[3] added b (2) |
154 working directory is now at e3b6d5df389b |
154 working directory is now at e3b6d5df389b |
164 created new head |
164 created new head |
165 $ hg prev |
165 $ hg prev |
166 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
166 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
167 [3] added b (2) |
167 [3] added b (2) |
168 $ hg next |
168 $ hg next |
|
169 ambigious next changeset: |
169 [4] added c |
170 [4] added c |
170 [5] added d |
171 [5] added d |
171 multiple non-obsolete children, explicitly update to one of them |
172 explicitly update to one of them |
172 [1] |
173 [1] |
173 |
174 |
174 next with ambiguity in aspiring children |
175 next with ambiguity in aspiring children |
175 |
176 |
176 $ hg am -m 'added b (3)' |
177 $ hg am -m 'added b (3)' |
177 2 new unstable changesets |
178 2 new unstable changesets |
178 $ hg next |
179 $ hg next |
179 no non-obsolete children |
180 no children |
180 [1] |
181 [1] |
181 $ hg evolve |
182 $ hg evolve |
182 abort: multiple evolve candidates |
183 abort: multiple evolve candidates |
183 (select one of e3b6d5df389b, 9df671ccd2c7 with --rev) |
184 (select one of e3b6d5df389b, 9df671ccd2c7 with --rev) |
184 [255] |
185 [255] |