Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: mark mergestate as dirty when resolve changes _state
authorMads Kiilerich <madski@unity3d.com>
Fri, 28 Feb 2014 02:26:03 +0100
changeset 20792 89059c450c56
parent 20791 8dd867bd67e1
child 20793 60c175c1e708
merge: mark mergestate as dirty when resolve changes _state Correctness - no visible difference so far.
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Mon Feb 24 22:42:14 2014 +0100
+++ b/mercurial/merge.py	Fri Feb 28 02:26:03 2014 +0100
@@ -271,6 +271,7 @@
         if r is None:
             # no real conflict
             del self._state[dfile]
+            self._dirty = True
         elif not r:
             self.mark(dfile, 'r')
         return r
mercurial