451 |
451 |
452 shelvectx = repo['tip'] |
452 shelvectx = repo['tip'] |
453 if not shelvectx in state.pendingctx.children(): |
453 if not shelvectx in state.pendingctx.children(): |
454 # rebase was a no-op, so it produced no child commit |
454 # rebase was a no-op, so it produced no child commit |
455 shelvectx = state.pendingctx |
455 shelvectx = state.pendingctx |
|
456 else: |
|
457 # only strip the shelvectx if the rebase produced it |
|
458 state.stripnodes.append(shelvectx.node()) |
456 |
459 |
457 mergefiles(ui, repo, state.wctx, shelvectx) |
460 mergefiles(ui, repo, state.wctx, shelvectx) |
458 |
461 |
459 state.stripnodes.append(shelvectx.node()) |
|
460 repair.strip(ui, repo, state.stripnodes, backup='none', topic='shelve') |
462 repair.strip(ui, repo, state.stripnodes, backup='none', topic='shelve') |
461 shelvedstate.clear(repo) |
463 shelvedstate.clear(repo) |
462 unshelvecleanup(ui, repo, state.name, opts) |
464 unshelvecleanup(ui, repo, state.name, opts) |
463 ui.status(_("unshelve of '%s' complete\n") % state.name) |
465 ui.status(_("unshelve of '%s' complete\n") % state.name) |
464 finally: |
466 finally: |