Patchwork D9042: mergestate: make in-memory mergestate not clear on-disk mergestate on reset()

login
register
mail settings
Submitter phabricator
Date Sept. 18, 2020, 6:20 a.m.
Message ID <differential-rev-PHID-DREV-pgwazrxowztyuxbjv7du-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47204/
State Superseded
Headers show

Comments

phabricator - Sept. 18, 2020, 6:20 a.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Oops, I thought I had remove the `rmtree()` call earlier. Maybe I
  accidentally got it back in a histedit or something.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9042

AFFECTED FILES
  mercurial/mergestate.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -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