Mercurial > hg

changeset 45500:f2efc44213ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: make in-memory mergestate not clear on-disk mergestate on reset() Oops, I thought I had remove the `rmtree()` call earlier. Maybe I accidentally got it back in a histedit or something. Differential Revision: https://phab.mercurial-scm.org/D9042
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 17 Sep 2020 23:12:48 -0700
parents 19590b126764
children 0e75c088f0dc
files mercurial/mergestate.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/mergestate.py	Tue Sep 15 16:10:16 2020 -0700
+++ b/mercurial/mergestate.py	Thu Sep 17 23:12:48 2020 -0700
@@ -193,7 +193,7 @@
         self._dirty = False
 
     def reset(self):
-        shutil.rmtree(self._repo.vfs.join(b'merge'), True)
+        pass
 
     def start(self, node, other, labels=None):
         self._local = node