Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/copies.py
changeset 45798 ff7e0ca666e8
parent 45673 7990e7d957b0
child 45892 06b64fabf91c 
--- a/mercurial/copies.py	Wed Oct 21 22:30:42 2020 +0200
+++ b/mercurial/copies.py	Tue Oct 13 05:15:44 2020 +0200
@@ -400,7 +400,10 @@
             elif changes is not None and dest in changes.merged:
                 minor[dest] = value
             elif not isancestor(new_tt, other_tt):
-                minor[dest] = value
+                if value[1] is not None:
+                    minor[dest] = value
+                elif isancestor(other_tt, new_tt):
+                    minor[dest] = value
 
 
 def _revinfo_getter_extra(repo):
Mercurial