Mercurial > public > mercurial-scm > hg-stable

diff 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
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Nov 18 13:55:31 2015 -0800
+++ b/mercurial/merge.py	Wed Nov 18 14:22:52 2015 -0800
@@ -432,11 +432,13 @@
             f = self._repo.vfs('merge/' + hash)
             self._repo.wwrite(dfile, f.read(), flags)
             f.close()
-            complete, r = filemerge.premerge(self._repo, self._local, lfile,
-                                             fcd, fco, fca, labels=labels)
+            complete, r, deleted = filemerge.premerge(self._repo, self._local,
+                                                      lfile, fcd, fco, fca,
+                                                      labels=labels)
         else:
-            complete, r = filemerge.filemerge(self._repo, self._local, lfile,
-                                              fcd, fco, fca, labels=labels)
+            complete, r, deleted = filemerge.filemerge(self._repo, self._local,
+                                                       lfile, fcd, fco, fca,
+                                                       labels=labels)
         if r is None:
             # no real conflict
             del self._state[dfile]