equal
deleted
inserted
replaced
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) |
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
59 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
58 updated to hidden changeset c41c793e0ef1 |
|
59 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
|
60 working directory parent is obsolete! (c41c793e0ef1) |
60 working directory parent is obsolete! (c41c793e0ef1) |
61 (use 'hg evolve' to update to its successor: e49523854bc8) |
61 (use 'hg evolve' to update to its successor: e49523854bc8) |
62 |
62 |
63 $ echo foobar > d |
63 $ echo foobar > d |
64 $ hg amend |
64 $ hg amend |
275 $ echo bar > c |
275 $ echo bar > c |
276 $ hg add c |
276 $ hg add c |
277 $ hg amend |
277 $ hg amend |
278 |
278 |
279 $ hg up --hidden c41c793e0ef1 |
279 $ hg up --hidden c41c793e0ef1 |
|
280 updating to a hidden changeset c41c793e0ef1 |
|
281 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) |
280 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
282 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
281 updated to hidden changeset c41c793e0ef1 |
|
282 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) |
|
283 working directory parent is obsolete! (c41c793e0ef1) |
283 working directory parent is obsolete! (c41c793e0ef1) |
284 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) |
284 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) |
285 $ echo bar > d |
285 $ echo bar > d |
286 $ hg amend |
286 $ hg amend |
287 2 new content-divergent changesets |
287 2 new content-divergent changesets |
419 |
419 |
420 $ echo bar > d |
420 $ echo bar > d |
421 $ hg amend |
421 $ hg amend |
422 |
422 |
423 $ hg up c41c793e0ef1 --hidden |
423 $ hg up c41c793e0ef1 --hidden |
|
424 updating to a hidden changeset c41c793e0ef1 |
|
425 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
424 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
426 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
425 updated to hidden changeset c41c793e0ef1 |
|
426 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
|
427 working directory parent is obsolete! (c41c793e0ef1) |
427 working directory parent is obsolete! (c41c793e0ef1) |
428 (use 'hg evolve' to update to its successor: e49523854bc8) |
428 (use 'hg evolve' to update to its successor: e49523854bc8) |
429 |
429 |
430 $ echo foobar > d |
430 $ echo foobar > d |
431 $ hg amend |
431 $ hg amend |