Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 27034:86ede9eda252

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: return whether the file was deleted This is required for change/delete conflict resolution -- see previous patches for more details.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 14:22:52 -0800
parents 8be0af32e513
children de7bf242644e
comparison
equal deleted inserted replaced
27033:089dab8794dc 27034:86ede9eda252
430 if preresolve: 430 if preresolve:
431 # restore local 431 # restore local
432 f = self._repo.vfs('merge/' + hash) 432 f = self._repo.vfs('merge/' + hash)
433 self._repo.wwrite(dfile, f.read(), flags) 433 self._repo.wwrite(dfile, f.read(), flags)
434 f.close() 434 f.close()
435 complete, r = filemerge.premerge(self._repo, self._local, lfile, 435 complete, r, deleted = filemerge.premerge(self._repo, self._local,
436 fcd, fco, fca, labels=labels) 436 lfile, fcd, fco, fca,
437 labels=labels)
437 else: 438 else:
438 complete, r = filemerge.filemerge(self._repo, self._local, lfile, 439 complete, r, deleted = filemerge.filemerge(self._repo, self._local,
439 fcd, fco, fca, labels=labels) 440 lfile, fcd, fco, fca,
441 labels=labels)
440 if r is None: 442 if r is None:
441 # no real conflict 443 # no real conflict
442 del self._state[dfile] 444 del self._state[dfile]
443 self._dirty = True 445 self._dirty = True
444 elif not r: 446 elif not r: