equal
deleted
inserted
replaced
393 [255] |
393 [255] |
394 |
394 |
395 $ hg revert -r . a/a |
395 $ hg revert -r . a/a |
396 $ hg resolve -m a/a |
396 $ hg resolve -m a/a |
397 (no more unresolved files) |
397 (no more unresolved files) |
|
398 continue: hg unshelve --continue |
398 |
399 |
399 $ hg commit -m 'commit while unshelve in progress' |
400 $ hg commit -m 'commit while unshelve in progress' |
400 abort: unshelve already in progress |
401 abort: unshelve already in progress |
401 (use 'hg unshelve --continue' or 'hg unshelve --abort') |
402 (use 'hg unshelve --continue' or 'hg unshelve --abort') |
402 [255] |
403 [255] |
838 |
839 |
839 $ hg revert -a -r . |
840 $ hg revert -a -r . |
840 reverting a/a (glob) |
841 reverting a/a (glob) |
841 $ hg resolve -m a/a |
842 $ hg resolve -m a/a |
842 (no more unresolved files) |
843 (no more unresolved files) |
|
844 continue: hg unshelve --continue |
843 $ hg unshelve -c |
845 $ hg unshelve -c |
844 rebasing 5:e42a7da90865 "changes to: second" (tip) |
846 rebasing 5:e42a7da90865 "changes to: second" (tip) |
845 note: rebase of 5:e42a7da90865 created no changes to commit |
847 note: rebase of 5:e42a7da90865 created no changes to commit |
846 unshelve of 'default' complete |
848 unshelve of 'default' complete |
847 $ hg bookmark |
849 $ hg bookmark |