Mercurial > hg
comparison mercurial/merge.py @ 20792:89059c450c56
merge: mark mergestate as dirty when resolve changes _state
Correctness - no visible difference so far.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 28 Feb 2014 02:26:03 +0100 |
| parents | 2a4871c2511d |
| children | 6500a2eebee8 |
comparison
equal
deleted
inserted
replaced
| 20791:8dd867bd67e1 | 20792:89059c450c56 |
|---|---|
| 269 f.close() | 269 f.close() |
| 270 r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca) | 270 r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca) |
| 271 if r is None: | 271 if r is None: |
| 272 # no real conflict | 272 # no real conflict |
| 273 del self._state[dfile] | 273 del self._state[dfile] |
| 274 self._dirty = True | |
| 274 elif not r: | 275 elif not r: |
| 275 self.mark(dfile, 'r') | 276 self.mark(dfile, 'r') |
| 276 return r | 277 return r |
| 277 | 278 |
| 278 def _checkunknownfile(repo, wctx, mctx, f): | 279 def _checkunknownfile(repo, wctx, mctx, f): |