Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 26606:2a405d307f8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: also return whether the merge is complete In future patches, we'll pause merges after the premerge step. After the premerge step we'll return complete = False.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 12:56:21 -0700
parents 56b2bcea2529
children a5ff66e6d77a
comparison
equal deleted inserted replaced
26605:ef21a2c41629 26606:2a405d307f8c
308 flags = flo 308 flags = flo
309 # restore local 309 # restore local
310 f = self._repo.vfs('merge/' + hash) 310 f = self._repo.vfs('merge/' + hash)
311 self._repo.wwrite(dfile, f.read(), flags) 311 self._repo.wwrite(dfile, f.read(), flags)
312 f.close() 312 f.close()
313 r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca, 313 complete, r = filemerge.filemerge(self._repo, self._local, lfile, fcd,
314 labels=labels) 314 fco, fca, labels=labels)
315 if r is None: 315 if r is None:
316 # no real conflict 316 # no real conflict
317 del self._state[dfile] 317 del self._state[dfile]
318 self._dirty = True 318 self._dirty = True
319 elif not r: 319 elif not r: