equal
deleted
inserted
replaced
341 $ hg amend |
341 $ hg amend |
342 |
342 |
343 create some content divergence |
343 create some content divergence |
344 |
344 |
345 $ hg co dff6e52f5e41 --hidden |
345 $ hg co dff6e52f5e41 --hidden |
346 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
346 updating to a hidden changeset dff6e52f5e41 |
347 updated to hidden changeset dff6e52f5e41 |
|
348 (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670) |
347 (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670) |
|
348 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
349 working directory parent is obsolete! (dff6e52f5e41) |
349 working directory parent is obsolete! (dff6e52f5e41) |
350 (use 'hg evolve' to update to its successor: 0825dcee2670) |
350 (use 'hg evolve' to update to its successor: 0825dcee2670) |
351 $ hg revert -r .^ c |
351 $ hg revert -r .^ c |
352 $ hg amend |
352 $ hg amend |
353 2 new content-divergent changesets |
353 2 new content-divergent changesets |