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