##// END OF EJS Templates
unshelve: clear shelvedstate and _finishunshelve() on partial unshelve...
Navaneeth Suresh -
r42932:6957f7b9 default
parent child Browse files
Show More
@@ -1003,11 +1003,10 b' def dounshelve(ui, repo, *shelved, **opt'
1003 with ui.configoverride(overrides, 'unshelve'):
1003 with ui.configoverride(overrides, 'unshelve'):
1004 mergefiles(ui, repo, pctx, shelvectx)
1004 mergefiles(ui, repo, pctx, shelvectx)
1005 restorebranch(ui, repo, branchtorestore)
1005 restorebranch(ui, repo, branchtorestore)
1006 shelvedstate.clear(repo)
1007 _finishunshelve(repo, oldtiprev, tr, activebookmark)
1006 if not ispartialunshelve:
1008 if not ispartialunshelve:
1007 _forgetunknownfiles(repo, shelvectx, addedbefore)
1009 _forgetunknownfiles(repo, shelvectx, addedbefore)
1008
1009 shelvedstate.clear(repo)
1010 _finishunshelve(repo, oldtiprev, tr, activebookmark)
1011 unshelvecleanup(ui, repo, basename, opts)
1010 unshelvecleanup(ui, repo, basename, opts)
1012 finally:
1011 finally:
1013 if tr:
1012 if tr:
@@ -1239,6 +1239,7 b' Abort unshelve while merging (issue5123)'
1239 > y
1239 > y
1240 > EOF
1240 > EOF
1241 unshelving change 'default'
1241 unshelving change 'default'
1242 temporarily committing pending changes (restore with 'hg unshelve --abort')
1242 rebasing shelved changes
1243 rebasing shelved changes
1243 diff --git a/d b/d
1244 diff --git a/d b/d
1244 new file mode 100644
1245 new file mode 100644
@@ -1250,6 +1251,10 b' Abort unshelve while merging (issue5123)'
1250 record this change to 'd'?
1251 record this change to 'd'?
1251 (enter ? for help) [Ynesfdaq?] y
1252 (enter ? for help) [Ynesfdaq?] y
1252
1253
1254
1255 $ hg status -v
1256 A c
1257 A d
1253 $ ls
1258 $ ls
1254 b
1259 b
1255 c
1260 c
@@ -1360,19 +1365,19 b' Abort unshelve while merging (issue5123)'
1360
1365
1361 #if stripbased
1366 #if stripbased
1362 $ hg log -r 3:: -G
1367 $ hg log -r 3:: -G
1363 @ changeset: 5:506510493902
1368 @ changeset: 5:f1d5f53e397b
1364 | tag: tip
1369 | tag: tip
1365 | parent: 3:adfeba9a1ac4
1370 | parent: 3:e28fd7fa7938
1366 | user: shelve@localhost
1371 | user: shelve@localhost
1367 | date: Thu Jan 01 00:00:00 1970 +0000
1372 | date: Thu Jan 01 00:00:00 1970 +0000
1368 | summary: changes to: add A to bars
1373 | summary: changes to: add A to bars
1369 |
1374 |
1370 | @ changeset: 4:8b023952e29c
1375 | @ changeset: 4:fe451a778c81
1371 |/ user: test
1376 |/ user: test
1372 | date: Thu Jan 01 00:00:00 1970 +0000
1377 | date: Thu Jan 01 00:00:00 1970 +0000
1373 | summary: add C to bars
1378 | summary: add C to bars
1374 |
1379 |
1375 o changeset: 3:adfeba9a1ac4
1380 o changeset: 3:e28fd7fa7938
1376 | user: test
1381 | user: test
1377 ~ date: Thu Jan 01 00:00:00 1970 +0000
1382 ~ date: Thu Jan 01 00:00:00 1970 +0000
1378 summary: add A to bars
1383 summary: add A to bars
@@ -1413,13 +1418,13 b' Abort unshelve while merging (issue5123)'
1413
1418
1414 #if stripbased
1419 #if stripbased
1415 $ hg log -r 3:: -G
1420 $ hg log -r 3:: -G
1416 @ changeset: 4:8b023952e29c
1421 @ changeset: 4:fe451a778c81
1417 | tag: tip
1422 | tag: tip
1418 | user: test
1423 | user: test
1419 | date: Thu Jan 01 00:00:00 1970 +0000
1424 | date: Thu Jan 01 00:00:00 1970 +0000
1420 | summary: add C to bars
1425 | summary: add C to bars
1421 |
1426 |
1422 o changeset: 3:adfeba9a1ac4
1427 o changeset: 3:e28fd7fa7938
1423 | user: test
1428 | user: test
1424 ~ date: Thu Jan 01 00:00:00 1970 +0000
1429 ~ date: Thu Jan 01 00:00:00 1970 +0000
1425 summary: add A to bars
1430 summary: add A to bars
General Comments 0
You need to be logged in to leave comments. Login now