[PATCH 3 of 9] merge: mark mergestate as dirty when resolve changes _state

Mads Kiilerich mads at kiilerich.com
Tue Mar 18 18:33:51 CDT 2014


# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1393550763 -3600
#      Fri Feb 28 02:26:03 2014 +0100
# Node ID 73968b322f241048e1e5fc2de8ba6dcd9f31809a
# Parent  ab2a99f9f3396fb705bd621fd5b2de04783ac101
merge: mark mergestate as dirty when resolve changes _state

Correctness - no visible difference so far.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -271,6 +271,7 @@ class mergestate(object):
         if r is None:
             # no real conflict
             del self._state[dfile]
+            self._dirty = True
         elif not r:
             self.mark(dfile, 'r')
         return r


More information about the Mercurial-devel mailing list