Show More
@@ -747,10 +747,10 b' def unshelvecontinue(ui, repo, state, op' | |||
|
747 | 747 | mergefiles(ui, repo, state.wctx, shelvectx) |
|
748 | 748 | restorebranch(ui, repo, state.branchtorestore) |
|
749 | 749 | |
|
750 | if not ispartialunshelve: | |
|
751 | 750 |
|
|
752 | 751 |
|
|
753 | 752 |
|
|
753 | if not ispartialunshelve: | |
|
754 | 754 | shelvedstate.clear(repo) |
|
755 | 755 | unshelvecleanup(ui, repo, state.name, opts) |
|
756 | 756 | _restoreactivebookmark(repo, state.activebookmark) |
@@ -1357,11 +1357,33 b' Abort unshelve while merging (issue5123)' | |||
|
1357 | 1357 | A |
|
1358 | 1358 | B |
|
1359 | 1359 | C |
|
1360 | ||
|
1361 | #if stripbased | |
|
1362 | $ hg log -r 3:: -G | |
|
1363 | @ changeset: 5:506510493902 | |
|
1364 | | tag: tip | |
|
1365 | | parent: 3:adfeba9a1ac4 | |
|
1366 | | user: shelve@localhost | |
|
1367 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1368 | | summary: changes to: add A to bars | |
|
1369 | | | |
|
1370 | | @ changeset: 4:8b023952e29c | |
|
1371 | |/ user: test | |
|
1372 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1373 | | summary: add C to bars | |
|
1374 | | | |
|
1375 | o changeset: 3:adfeba9a1ac4 | |
|
1376 | | user: test | |
|
1377 | ~ date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1378 | summary: add A to bars | |
|
1379 | ||
|
1380 | #endif | |
|
1381 | ||
|
1360 | 1382 | $ hg unshelve --continue <<EOF |
|
1361 | 1383 | > y |
|
1362 | 1384 | > y |
|
1363 | 1385 | > y |
|
1364 |
> |
|
|
1386 | > n | |
|
1365 | 1387 | > EOF |
|
1366 | 1388 | diff --git a/bar1 b/bar1 |
|
1367 | 1389 | 1 hunks, 1 lines changed |
@@ -1385,6 +1407,21 b' Abort unshelve while merging (issue5123)' | |||
|
1385 | 1407 | +B |
|
1386 | 1408 | C |
|
1387 | 1409 | record change 2/2 to 'bar2'? |
|
1388 |
(enter ? for help) [Ynesfdaq?] |
|
|
1410 | (enter ? for help) [Ynesfdaq?] n | |
|
1389 | 1411 | |
|
1390 | 1412 | unshelve of 'default-01' complete |
|
1413 | ||
|
1414 | #if stripbased | |
|
1415 | $ hg log -r 3:: -G | |
|
1416 | @ changeset: 4:8b023952e29c | |
|
1417 | | tag: tip | |
|
1418 | | user: test | |
|
1419 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1420 | | summary: add C to bars | |
|
1421 | | | |
|
1422 | o changeset: 3:adfeba9a1ac4 | |
|
1423 | | user: test | |
|
1424 | ~ date: Thu Jan 01 00:00:00 1970 +0000 | |
|
1425 | summary: add A to bars | |
|
1426 | ||
|
1427 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now