Submitter | Boris Feld |
---|---|
Date | Aug. 29, 2018, 4:30 p.m. |
Message ID | <95c87531a5cc2f5ee8ef.1535560255@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/34151/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/hgext/shelve.py b/hgext/shelve.py --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -770,6 +770,11 @@ def _unshelverestorecommit(ui, repo, bas with ui.configoverride({('ui', 'quiet'): True}): shelvedfile(repo, basename, 'hg').applybundle() shelvectx = repo['tip'] + # We might no strip the unbundled changeset, so we should keep track of + # the unshelve node in case we need to reuse it (eg: unshelve --keep) + if node is None: + info = {'node': nodemod.hex(node)} + shelvedfile(repo, basename, 'shelve').writeinfo(info) else: shelvectx = repo[node]