equal
deleted
inserted
replaced
389 |
389 |
390 lock = repo.lock() |
390 lock = repo.lock() |
391 |
391 |
392 mergefiles(ui, repo, state.wctx, state.pendingctx) |
392 mergefiles(ui, repo, state.wctx, state.pendingctx) |
393 |
393 |
394 repair.strip(ui, repo, state.stripnodes, backup='none', topic='shelve') |
394 repair.strip(ui, repo, state.stripnodes, backup=False, topic='shelve') |
395 shelvedstate.clear(repo) |
395 shelvedstate.clear(repo) |
396 ui.warn(_("unshelve of '%s' aborted\n") % state.name) |
396 ui.warn(_("unshelve of '%s' aborted\n") % state.name) |
397 finally: |
397 finally: |
398 lockmod.release(lock, wlock) |
398 lockmod.release(lock, wlock) |
399 |
399 |
458 shelvectx = state.pendingctx |
458 shelvectx = state.pendingctx |
459 |
459 |
460 mergefiles(ui, repo, state.wctx, shelvectx) |
460 mergefiles(ui, repo, state.wctx, shelvectx) |
461 |
461 |
462 state.stripnodes.append(shelvectx.node()) |
462 state.stripnodes.append(shelvectx.node()) |
463 repair.strip(ui, repo, state.stripnodes, backup='none', topic='shelve') |
463 repair.strip(ui, repo, state.stripnodes, backup=False, topic='shelve') |
464 shelvedstate.clear(repo) |
464 shelvedstate.clear(repo) |
465 unshelvecleanup(ui, repo, state.name, opts) |
465 unshelvecleanup(ui, repo, state.name, opts) |
466 ui.status(_("unshelve of '%s' complete\n") % state.name) |
466 ui.status(_("unshelve of '%s' complete\n") % state.name) |
467 finally: |
467 finally: |
468 lockmod.release(lock, wlock) |
468 lockmod.release(lock, wlock) |