diff -r e53778ad64bf -r a8fb29b05f92 mercurial/copies.py
--- a/mercurial/copies.py	Tue Sep 15 10:55:17 2020 +0200
+++ b/mercurial/copies.py	Wed Sep 16 21:00:02 2020 +0200
@@ -371,11 +371,15 @@
                 continue
             # content from "major" wins, unless it is older
             # than the branch point or there is a merge
-            if (
-                new_tt == other_tt
-                or not isancestor(new_tt, other_tt)
-                or dest in changes.merged
-            ):
+            if new_tt == other_tt:
+                minor[dest] = value
+            elif value[1] is None and dest in changes.salvaged:
+                pass
+            elif other[1] is None and dest in changes.salvaged:
+                minor[dest] = value
+            elif not isancestor(new_tt, other_tt):
+                minor[dest] = value
+            elif dest in changes.merged:
                 minor[dest] = value