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