Mercurial > hg
comparison hgext/shelve.py @ 22844:1533e642262d
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 10 Oct 2014 12:15:46 -0500 |
| parents | 73d7de6f9b47 d43d116a118c |
| children | 43816070284e |
comparison
equal
deleted
inserted
replaced
| 22841:18b3869179f9 | 22844:1533e642262d |
|---|---|
| 447 | 447 |
| 448 shelvectx = repo['tip'] | 448 shelvectx = repo['tip'] |
| 449 if not shelvectx in state.pendingctx.children(): | 449 if not shelvectx in state.pendingctx.children(): |
| 450 # rebase was a no-op, so it produced no child commit | 450 # rebase was a no-op, so it produced no child commit |
| 451 shelvectx = state.pendingctx | 451 shelvectx = state.pendingctx |
| 452 else: | |
| 453 # only strip the shelvectx if the rebase produced it | |
| 454 state.stripnodes.append(shelvectx.node()) | |
| 452 | 455 |
| 453 mergefiles(ui, repo, state.wctx, shelvectx) | 456 mergefiles(ui, repo, state.wctx, shelvectx) |
| 454 | 457 |
| 455 state.stripnodes.append(shelvectx.node()) | |
| 456 repair.strip(ui, repo, state.stripnodes, backup=False, topic='shelve') | 458 repair.strip(ui, repo, state.stripnodes, backup=False, topic='shelve') |
| 457 shelvedstate.clear(repo) | 459 shelvedstate.clear(repo) |
| 458 unshelvecleanup(ui, repo, state.name, opts) | 460 unshelvecleanup(ui, repo, state.name, opts) |
| 459 ui.status(_("unshelve of '%s' complete\n") % state.name) | 461 ui.status(_("unshelve of '%s' complete\n") % state.name) |
| 460 finally: | 462 finally: |