180 o 0:c471ef929e6a@default(draft) addroot |
180 o 0:c471ef929e6a@default(draft) addroot |
181 |
181 |
182 $ hg evolve --any -v |
182 $ hg evolve --any -v |
183 no unstable changesets to evolve |
183 no unstable changesets to evolve |
184 [1] |
184 [1] |
|
185 |
|
186 Ambiguous evolution |
|
187 $ echo a > k |
|
188 $ hg add k |
|
189 $ hg ci -m firstambiguous |
|
190 $ hg up .^ |
|
191 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
192 $ echo a > l |
|
193 $ hg add l |
|
194 $ hg ci -m secondambiguous |
|
195 created new head |
|
196 $ hg up .^ |
|
197 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
198 $ hg commit --amend -m "newmessage" |
|
199 2 new unstable changesets |
|
200 $ hg log -G |
|
201 @ changeset: 15:49773ccde390 |
|
202 | tag: tip |
|
203 | parent: 11:036cf654e942 |
|
204 | user: test |
|
205 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
206 | summary: newmessage |
|
207 | |
|
208 | o changeset: 14:a9892777b519 |
|
209 | | parent: 12:e99ecf51c867 |
|
210 | | user: test |
|
211 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
212 | | summary: secondambiguous |
|
213 | | |
|
214 | | o changeset: 13:0b6e26b2472d |
|
215 | |/ user: test |
|
216 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
217 | | summary: firstambiguous |
|
218 | | |
|
219 | x changeset: 12:e99ecf51c867 |
|
220 |/ user: test |
|
221 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
222 | summary: addc |
|
223 | |
|
224 o changeset: 11:036cf654e942 |
|
225 | parent: 7:005fe5914f78 |
|
226 | user: test |
|
227 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
228 | summary: addb |
|
229 | |
|
230 o changeset: 7:005fe5914f78 |
|
231 | parent: 0:c471ef929e6a |
|
232 | user: test |
|
233 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
234 | summary: adda |
|
235 | |
|
236 o changeset: 0:c471ef929e6a |
|
237 user: test |
|
238 date: Thu Jan 01 00:00:00 1970 +0000 |
|
239 summary: addroot |
|
240 |
|
241 $ hg evolve |
|
242 abort: multiple evolve candidates |
|
243 (select one of *, * with --rev) (glob) |
|
244 [255] |
|
245 |
|
246 |
|
247 |