52 |
52 |
53 $ echo bar > d |
53 $ echo bar > d |
54 $ hg amend |
54 $ hg amend |
55 |
55 |
56 $ hg up c41c793e0ef1 --hidden |
56 $ hg up c41c793e0ef1 --hidden |
57 updating to a hidden changeset c41c793e0ef1 |
|
58 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
|
59 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
60 working directory parent is obsolete! (c41c793e0ef1) |
58 working directory parent is obsolete! (c41c793e0ef1) |
61 (use 'hg evolve' to update to its successor: e49523854bc8) |
59 (use 'hg evolve' to update to its successor: e49523854bc8) |
62 |
60 |
63 $ echo foobar > d |
61 $ echo foobar > d |
64 $ hg amend |
62 $ hg amend |
65 2 new content-divergent changesets |
|
66 $ hg glog --hidden |
63 $ hg glog --hidden |
67 @ 6:9c1631e352d9 added d |
64 @ 6:9c1631e352d9 added d |
68 | () draft |
65 | () draft |
69 | * 5:e49523854bc8 added d |
66 | o 5:e49523854bc8 added d |
70 |/ () draft |
67 |/ () draft |
71 | x 4:c41c793e0ef1 added d |
68 | x 4:c41c793e0ef1 added d |
72 |/ () draft |
69 |/ () draft |
73 o 3:ca1b80f7960a added c |
70 o 3:ca1b80f7960a added c |
74 | () draft |
71 | () draft |
126 working directory is now at 9c1631e352d9 |
123 working directory is now at 9c1631e352d9 |
127 |
124 |
128 $ hg glog --hidden |
125 $ hg glog --hidden |
129 @ 6:9c1631e352d9 added d |
126 @ 6:9c1631e352d9 added d |
130 | () draft |
127 | () draft |
131 | * 5:e49523854bc8 added d |
128 | o 5:e49523854bc8 added d |
132 |/ () draft |
129 |/ () draft |
133 | x 4:c41c793e0ef1 added d |
130 | x 4:c41c793e0ef1 added d |
134 |/ () draft |
131 |/ () draft |
135 o 3:ca1b80f7960a added c |
132 o 3:ca1b80f7960a added c |
136 | () draft |
133 | () draft |
149 $ hg amend |
146 $ hg amend |
150 $ hg up .^ |
147 $ hg up .^ |
151 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
148 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
152 $ echo bar > c |
149 $ echo bar > c |
153 $ hg amend |
150 $ hg amend |
154 2 new orphan changesets |
|
155 $ hg up ca1b80f7960a --hidden |
151 $ hg up ca1b80f7960a --hidden |
156 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
152 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
157 working directory parent is obsolete! (ca1b80f7960a) |
153 working directory parent is obsolete! (ca1b80f7960a) |
158 (use 'hg evolve' to update to its successor: 2ba73e31f264) |
154 (use 'hg evolve' to update to its successor: 2ba73e31f264) |
159 $ echo foobar > c |
155 $ echo foobar > c |
160 $ hg amend |
156 $ hg amend |
161 2 new content-divergent changesets |
|
162 $ echo bar > c |
157 $ echo bar > c |
163 $ hg amend |
158 $ hg amend |
164 |
159 |
165 $ hg glog --hidden |
160 $ hg glog --hidden |
166 @ 10:491e10505bae added c |
161 @ 10:491e10505bae added c |
167 | () draft |
162 | () draft |
168 | x 9:7398f702a162 added c |
163 | x 9:7398f702a162 added c |
169 |/ () draft |
164 |/ () draft |
170 | * 8:2ba73e31f264 added c |
165 | o 8:2ba73e31f264 added c |
171 |/ () draft |
166 |/ () draft |
172 | * 7:f0f1694f123e added d |
167 | o 7:f0f1694f123e added d |
173 | | () draft |
168 | | () draft |
174 | | x 6:9c1631e352d9 added d |
169 | | x 6:9c1631e352d9 added d |
175 | |/ () draft |
170 | |/ () draft |
176 | | * 5:e49523854bc8 added d |
171 | | o 5:e49523854bc8 added d |
177 | |/ () draft |
172 | |/ () draft |
178 | | x 4:c41c793e0ef1 added d |
173 | | x 4:c41c793e0ef1 added d |
179 | |/ () draft |
174 | |/ () draft |
180 | x 3:ca1b80f7960a added c |
175 | x 3:ca1b80f7960a added c |
181 |/ () draft |
176 |/ () draft |
199 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
194 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
200 fix conflicts and see `hg help evolve.interrupted` |
195 fix conflicts and see `hg help evolve.interrupted` |
201 [1] |
196 [1] |
202 |
197 |
203 $ hg evolve --abort |
198 $ hg evolve --abort |
204 2 new content-divergent changesets |
|
205 evolve aborted |
199 evolve aborted |
206 working directory is now at 491e10505bae |
200 working directory is now at 491e10505bae |
207 |
201 |
208 $ hg glog --hidden |
202 $ hg glog --hidden |
209 @ 10:491e10505bae added c |
203 @ 10:491e10505bae added c |
210 | () draft |
204 | () draft |
211 | x 9:7398f702a162 added c |
205 | x 9:7398f702a162 added c |
212 |/ () draft |
206 |/ () draft |
213 | * 8:2ba73e31f264 added c |
207 | o 8:2ba73e31f264 added c |
214 |/ () draft |
208 |/ () draft |
215 | * 7:f0f1694f123e added d |
209 | o 7:f0f1694f123e added d |
216 | | () draft |
210 | | () draft |
217 | | x 6:9c1631e352d9 added d |
211 | | x 6:9c1631e352d9 added d |
218 | |/ () draft |
212 | |/ () draft |
219 | | * 5:e49523854bc8 added d |
213 | | o 5:e49523854bc8 added d |
220 | |/ () draft |
214 | |/ () draft |
221 | | x 4:c41c793e0ef1 added d |
215 | | x 4:c41c793e0ef1 added d |
222 | |/ () draft |
216 | |/ () draft |
223 | x 3:ca1b80f7960a added c |
217 | x 3:ca1b80f7960a added c |
224 |/ () draft |
218 |/ () draft |
228 | () draft |
222 | () draft |
229 o 0:8fa14d15e168 added hgignore |
223 o 0:8fa14d15e168 added hgignore |
230 () draft |
224 () draft |
231 |
225 |
232 $ hg obslog -r . --all |
226 $ hg obslog -r . --all |
233 * 2ba73e31f264 (8) added c |
227 o 2ba73e31f264 (8) added c |
234 | |
228 | |
235 | @ 491e10505bae (10) added c |
229 | @ 491e10505bae (10) added c |
236 | | |
230 | | |
237 | x 7398f702a162 (9) added c |
231 | x 7398f702a162 (9) added c |
238 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
232 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
271 $ echo bar > c |
265 $ echo bar > c |
272 $ hg add c |
266 $ hg add c |
273 $ hg amend |
267 $ hg amend |
274 |
268 |
275 $ hg up --hidden c41c793e0ef1 |
269 $ hg up --hidden c41c793e0ef1 |
276 updating to a hidden changeset c41c793e0ef1 |
|
277 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) |
|
278 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
270 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
279 working directory parent is obsolete! (c41c793e0ef1) |
271 working directory parent is obsolete! (c41c793e0ef1) |
280 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) |
272 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) |
281 $ echo bar > d |
273 $ echo bar > d |
282 $ hg amend |
274 $ hg amend |
283 2 new content-divergent changesets |
|
284 |
275 |
285 $ hg glog |
276 $ hg glog |
286 @ 7:e49523854bc8 added d |
277 @ 7:e49523854bc8 added d |
287 | () draft |
278 | () draft |
288 | * 6:69bdd23a9b0d added d |
279 | o 6:69bdd23a9b0d added d |
289 | | () draft |
280 | | () draft |
290 o | 3:ca1b80f7960a added c |
281 o | 3:ca1b80f7960a added c |
291 | | () draft |
282 | | () draft |
292 o | 2:b1661037fa25 added b |
283 o | 2:b1661037fa25 added b |
293 |/ () draft |
284 |/ () draft |
311 working directory is now at e49523854bc8 |
302 working directory is now at e49523854bc8 |
312 |
303 |
313 $ hg glog |
304 $ hg glog |
314 @ 7:e49523854bc8 added d |
305 @ 7:e49523854bc8 added d |
315 | () draft |
306 | () draft |
316 | * 6:69bdd23a9b0d added d |
307 | o 6:69bdd23a9b0d added d |
317 | | () draft |
308 | | () draft |
318 o | 3:ca1b80f7960a added c |
309 o | 3:ca1b80f7960a added c |
319 | | () draft |
310 | | () draft |
320 o | 2:b1661037fa25 added b |
311 o | 2:b1661037fa25 added b |
321 |/ () draft |
312 |/ () draft |
364 working directory is now at 33e4442acf98 |
355 working directory is now at 33e4442acf98 |
365 |
356 |
366 $ hg glog |
357 $ hg glog |
367 @ 8:33e4442acf98 added d |
358 @ 8:33e4442acf98 added d |
368 | () draft |
359 | () draft |
369 | * 7:e49523854bc8 added d |
360 | o 7:e49523854bc8 added d |
370 | | () draft |
361 | | () draft |
371 | o 3:ca1b80f7960a added c |
362 | o 3:ca1b80f7960a added c |
372 | | () draft |
363 | | () draft |
373 | o 2:b1661037fa25 added b |
364 | o 2:b1661037fa25 added b |
374 |/ () draft |
365 |/ () draft |
413 |
404 |
414 $ echo bar > d |
405 $ echo bar > d |
415 $ hg amend |
406 $ hg amend |
416 |
407 |
417 $ hg up c41c793e0ef1 --hidden |
408 $ hg up c41c793e0ef1 --hidden |
418 updating to a hidden changeset c41c793e0ef1 |
|
419 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
|
420 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
409 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
421 working directory parent is obsolete! (c41c793e0ef1) |
410 working directory parent is obsolete! (c41c793e0ef1) |
422 (use 'hg evolve' to update to its successor: e49523854bc8) |
411 (use 'hg evolve' to update to its successor: e49523854bc8) |
423 |
412 |
424 $ echo foobar > d |
413 $ echo foobar > d |
425 $ hg amend |
414 $ hg amend |
426 2 new content-divergent changesets |
|
427 $ hg glog --hidden |
415 $ hg glog --hidden |
428 @ 6:9c1631e352d9 added d |
416 @ 6:9c1631e352d9 added d |
429 | () draft |
417 | () draft |
430 | * 5:e49523854bc8 added d |
418 | o 5:e49523854bc8 added d |
431 |/ () draft |
419 |/ () draft |
432 | x 4:c41c793e0ef1 added d |
420 | x 4:c41c793e0ef1 added d |
433 |/ () draft |
421 |/ () draft |
434 o 3:ca1b80f7960a added c |
422 o 3:ca1b80f7960a added c |
435 | () draft |
423 | () draft |
455 working directory is now at 9c1631e352d9 |
443 working directory is now at 9c1631e352d9 |
456 |
444 |
457 $ hg glog --hidden |
445 $ hg glog --hidden |
458 @ 6:9c1631e352d9 added d |
446 @ 6:9c1631e352d9 added d |
459 | () draft |
447 | () draft |
460 | * 5:e49523854bc8 added d |
448 | o 5:e49523854bc8 added d |
461 |/ () draft |
449 |/ () draft |
462 | x 4:c41c793e0ef1 added d |
450 | x 4:c41c793e0ef1 added d |
463 |/ () draft |
451 |/ () draft |
464 o 3:ca1b80f7960a added c |
452 o 3:ca1b80f7960a added c |
465 | () draft |
453 | () draft |
478 rebasing 6:9c1631e352d9 "added d" (tip) |
466 rebasing 6:9c1631e352d9 "added d" (tip) |
479 |
467 |
480 $ hg glog |
468 $ hg glog |
481 @ 7:517d4375cb72 added d |
469 @ 7:517d4375cb72 added d |
482 | () draft |
470 | () draft |
483 | * 5:e49523854bc8 added d |
471 | o 5:e49523854bc8 added d |
484 | | () draft |
472 | | () draft |
485 | o 3:ca1b80f7960a added c |
473 | o 3:ca1b80f7960a added c |
486 | | () draft |
474 | | () draft |
487 | o 2:b1661037fa25 added b |
475 | o 2:b1661037fa25 added b |
488 |/ () draft |
476 |/ () draft |
507 working directory is now at 517d4375cb72 |
495 working directory is now at 517d4375cb72 |
508 |
496 |
509 $ hg glog |
497 $ hg glog |
510 @ 7:517d4375cb72 added d |
498 @ 7:517d4375cb72 added d |
511 | () draft |
499 | () draft |
512 | * 5:e49523854bc8 added d |
500 | o 5:e49523854bc8 added d |
513 | | () draft |
501 | | () draft |
514 | o 3:ca1b80f7960a added c |
502 | o 3:ca1b80f7960a added c |
515 | | () draft |
503 | | () draft |
516 | o 2:b1661037fa25 added b |
504 | o 2:b1661037fa25 added b |
517 |/ () draft |
505 |/ () draft |
571 stopped the interrupted evolve |
559 stopped the interrupted evolve |
572 working directory is now at ca1b80f7960a |
560 working directory is now at ca1b80f7960a |
573 |
561 |
574 XXX: we should have preserved the wdir to be at rev 8 |
562 XXX: we should have preserved the wdir to be at rev 8 |
575 $ hg glog |
563 $ hg glog |
576 * 8:8fd1c4bd144c added d |
564 o 8:8fd1c4bd144c added d |
577 | () draft |
565 | () draft |
578 | * 5:e49523854bc8 added d |
566 | o 5:e49523854bc8 added d |
579 | | () draft |
567 | | () draft |
580 | @ 3:ca1b80f7960a added c |
568 | @ 3:ca1b80f7960a added c |
581 | | () draft |
569 | | () draft |
582 | o 2:b1661037fa25 added b |
570 | o 2:b1661037fa25 added b |
583 |/ () draft |
571 |/ () draft |