changeset 38508 | 39db5a01cd53 |
parent 38463 | f4776f8b98e0 |
child 38618 | c829749e7639 |
--- a/hgext/shelve.py Sat Jun 30 07:23:02 2018 +0530 +++ b/hgext/shelve.py Sun Jul 01 21:40:55 2018 +0900 @@ -709,7 +709,7 @@ state.nodestoremove.append(newnode) shelvectx = repo[newnode] - hg.updaterepo(repo, pendingctx.node(), False) + hg.updaterepo(repo, pendingctx.node(), overwrite=False) if repo.vfs.exists('unshelverebasestate'): repo.vfs.rename('unshelverebasestate', 'rebasestate')