Mercurial > hg

comparison mercurial/merge.py @ 26651:d58f2f0e2b19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.mergedriver: don't try resolving files marked driver-resolved The driver is expected to take care of these.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 30 Sep 2015 19:43:51 -0700
parents 6ff5534c8afc
children 2b955fec91e0
comparison
equal deleted inserted replaced
26650:6ff5534c8afc 26651:d58f2f0e2b19
329 if entry[0] == 'u': 329 if entry[0] == 'u':
330 yield f 330 yield f
331 331
332 def _resolve(self, preresolve, dfile, wctx, labels=None): 332 def _resolve(self, preresolve, dfile, wctx, labels=None):
333 """rerun merge process for file path `dfile`""" 333 """rerun merge process for file path `dfile`"""
334 if self[dfile] == 'r': 334 if self[dfile] in 'rd':
335 return True, 0 335 return True, 0
336 stateentry = self._state[dfile] 336 stateentry = self._state[dfile]
337 state, hash, lfile, afile, anode, ofile, onode, flags = stateentry 337 state, hash, lfile, afile, anode, ofile, onode, flags = stateentry
338 octx = self._repo[self._other] 338 octx = self._repo[self._other]
339 fcd = wctx[dfile] 339 fcd = wctx[dfile]