# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1558079877 25200
# Node ID c0e1ea0c4cee62f79855dce4075dc499dea00693
# Parent  78530404d00b30610847c7be26a390149475e3f8
convert: don't include file in "files" list if it's added in p2

If the file is from p2, we should clearly compare the flags to what
they were in p2.

Also note that manifest.flags('non-existent') unfortunately returns ''
instead of erroring out.

Differential Revision: https://phab.mercurial-scm.org/D6409

diff -r 78530404d00b -r c0e1ea0c4cee mercurial/localrepo.py
--- a/mercurial/localrepo.py	Fri May 17 11:32:48 2019 -0700
+++ b/mercurial/localrepo.py	Fri May 17 00:57:57 2019 -0700
@@ -2367,7 +2367,10 @@
             node = fctx.filenode()
             if node in [fparent1, fparent2]:
                 self.ui.debug('reusing %s filelog entry\n' % fname)
-                if manifest1.flags(fname) != fctx.flags():
+                if ((fparent1 != nullid and
+                     manifest1.flags(fname) != fctx.flags()) or
+                    (fparent2 != nullid and
+                     manifest2.flags(fname) != fctx.flags())):
                     changelist.append(fname)
                 return node
 
diff -r 78530404d00b -r c0e1ea0c4cee tests/test-convert-hg-sink.t
--- a/tests/test-convert-hg-sink.t	Fri May 17 11:32:48 2019 -0700
+++ b/tests/test-convert-hg-sink.t	Fri May 17 00:57:57 2019 -0700
@@ -616,8 +616,9 @@
   |/
   o  0 add 0
   
-BROKEN: now 'a' appears changed
+
+# Still no files
   $ hg log -r 3 -T '{files}\n'
-  a
+  
 
 #endif