Show More
@@ -750,8 +750,8 b' def unshelvecontinue(ui, repo, state, op' | |||
|
750 | 750 | if not phases.supportinternal(repo): |
|
751 | 751 | repair.strip(ui, repo, state.nodestoremove, backup=False, |
|
752 | 752 | topic='shelve') |
|
753 | shelvedstate.clear(repo) | |
|
753 | 754 | if not ispartialunshelve: |
|
754 | shelvedstate.clear(repo) | |
|
755 | 755 | unshelvecleanup(ui, repo, state.name, opts) |
|
756 | 756 | _restoreactivebookmark(repo, state.activebookmark) |
|
757 | 757 | ui.status(_("unshelve of '%s' complete\n") % state.name) |
@@ -1425,3 +1425,29 b' Abort unshelve while merging (issue5123)' | |||
|
1425 | 1425 | summary: add A to bars |
|
1426 | 1426 | |
|
1427 | 1427 | #endif |
|
1428 | ||
|
1429 | $ hg unshelve --continue | |
|
1430 | abort: no unshelve in progress | |
|
1431 | [255] | |
|
1432 | ||
|
1433 | $ hg shelve --list | |
|
1434 | default-01 (*)* changes to: add A to bars (glob) | |
|
1435 | default (*)* changes to: add B to foo (glob) | |
|
1436 | $ hg unshelve -n default-01 -i <<EOF | |
|
1437 | > y | |
|
1438 | > y | |
|
1439 | > EOF | |
|
1440 | temporarily committing pending changes (restore with 'hg unshelve --abort') | |
|
1441 | rebasing shelved changes | |
|
1442 | diff --git a/bar2 b/bar2 | |
|
1443 | 1 hunks, 1 lines changed | |
|
1444 | examine changes to 'bar2'? | |
|
1445 | (enter ? for help) [Ynesfdaq?] y | |
|
1446 | ||
|
1447 | @@ -1,2 +1,3 @@ | |
|
1448 | A | |
|
1449 | +B | |
|
1450 | C | |
|
1451 | record this change to 'bar2'? | |
|
1452 | (enter ? for help) [Ynesfdaq?] y | |
|
1453 |
General Comments 0
You need to be logged in to leave comments.
Login now