equal
deleted
inserted
replaced
242 (leaving bookmark touncommit-bm) |
242 (leaving bookmark touncommit-bm) |
243 working directory parent is obsolete! (5eb72dbe0cb4) |
243 working directory parent is obsolete! (5eb72dbe0cb4) |
244 (use 'hg evolve' to update to its successor: e8db4aa611f6) |
244 (use 'hg evolve' to update to its successor: e8db4aa611f6) |
245 $ hg --config extensions.purge= purge |
245 $ hg --config extensions.purge= purge |
246 $ hg uncommit -I 'set:added() and e' |
246 $ hg uncommit -I 'set:added() and e' |
247 2 new content-divergent changesets |
247 2 new divergent changesets |
248 $ hg st --copies |
248 $ hg st --copies |
249 A e |
249 A e |
250 $ hg st --copies --change . |
250 $ hg st --copies --change . |
251 M b |
251 M b |
252 M d |
252 M d |
288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
289 working directory parent is obsolete! (5eb72dbe0cb4) |
289 working directory parent is obsolete! (5eb72dbe0cb4) |
290 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
290 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
291 $ hg --config extensions.purge= purge |
291 $ hg --config extensions.purge= purge |
292 $ hg uncommit --all -X e |
292 $ hg uncommit --all -X e |
293 1 new content-divergent changesets |
293 1 new divergent changesets |
294 $ hg st --copies |
294 $ hg st --copies |
295 M b |
295 M b |
296 M d |
296 M d |
297 M j |
297 M j |
298 M o |
298 M o |
335 $ hg ci -Am addunrelated unrelated |
335 $ hg ci -Am addunrelated unrelated |
336 $ hg previous |
336 $ hg previous |
337 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
337 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
338 [8] touncommit |
338 [8] touncommit |
339 $ hg uncommit aa |
339 $ hg uncommit aa |
340 1 new orphan changesets |
340 1 new unstable changesets |
341 |
341 |
342 Test uncommiting agains a different base |
342 Test uncommiting agains a different base |
343 |
343 |
344 $ hg cat b --rev . |
344 $ hg cat b --rev . |
345 b |
345 b |