--- a/mercurial/copies.py Sat May 16 20:37:44 2020 +0200
+++ b/mercurial/copies.py Sat May 16 20:37:56 2020 +0200
@@ -534,9 +534,9 @@
# thing in pathcopies(): pathcopies(x, y) can return a copy where the
# destination doesn't exist in y.
pass
- elif m2[src] != mb[src]:
- if not _related(c2[src], base[src]):
- return
+ elif mb[src] != m2[src] and not _related(c2[src], base[src]):
+ return
+ elif mb[src] != m2[src] or mb.flags(src) != m2.flags(src):
# modified on side 2
for dst in dsts1:
copy[dst] = src