Submitter | Mads Kiilerich |
---|---|
Date | March 18, 2014, 11:33 p.m. |
Message ID | <73968b322f241048e1e5.1395185631@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/3974/ |
State | Accepted |
Commit | 89059c450c56a9ecf21492748294e1923ddc69ba |
Headers | show |
Comments
On Wed, 2014-03-19 at 00:33 +0100, Mads Kiilerich wrote: > # HG changeset patch > # User Mads Kiilerich <madski@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. Looks obviously correct, queued.
Patch
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