Show More
@@ -871,9 +871,9 b' def unshelvecontinue(ui, repo, state, op' | |||||
871 | with repo.ui.configoverride(overrides, b'unshelve'): |
|
871 | with repo.ui.configoverride(overrides, b'unshelve'): | |
872 | with repo.dirstate.changing_parents(repo): |
|
872 | with repo.dirstate.changing_parents(repo): | |
873 | repo.setparents(state.parents[0], repo.nullid) |
|
873 | repo.setparents(state.parents[0], repo.nullid) | |
874 |
|
|
874 | newnode, ispartialunshelve = _createunshelvectx( | |
875 |
|
|
875 | ui, repo, shelvectx, basename, interactive, opts | |
876 |
|
|
876 | ) | |
877 |
|
877 | |||
878 | if newnode is None: |
|
878 | if newnode is None: | |
879 | shelvectx = state.pendingctx |
|
879 | shelvectx = state.pendingctx | |
@@ -1070,9 +1070,9 b' def _rebaserestoredcommit(' | |||||
1070 |
|
1070 | |||
1071 | with repo.dirstate.changing_parents(repo): |
|
1071 | with repo.dirstate.changing_parents(repo): | |
1072 | repo.setparents(tmpwctx.node(), repo.nullid) |
|
1072 | repo.setparents(tmpwctx.node(), repo.nullid) | |
1073 |
|
|
1073 | newnode, ispartialunshelve = _createunshelvectx( | |
1074 |
|
|
1074 | ui, repo, shelvectx, basename, interactive, opts | |
1075 |
|
|
1075 | ) | |
1076 |
|
1076 | |||
1077 | if newnode is None: |
|
1077 | if newnode is None: | |
1078 | shelvectx = tmpwctx |
|
1078 | shelvectx = tmpwctx |
General Comments 0
You need to be logged in to leave comments.
Login now