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