diff -r 7815cf0ea88b -r 31abb9d713af mercurial/copies.py
--- a/mercurial/copies.py	Sat Apr 13 00:24:17 2019 -0700
+++ b/mercurial/copies.py	Fri Apr 12 22:03:04 2019 -0700
@@ -682,6 +682,11 @@
         if len(fl) == 2 and fl[0] == fl[1]:
             copy[fl[0]] = of # not actually divergent, just matching renames
 
+    # Sometimes we get invalid copies here (the "and not remotebase" in
+    # _checkcopies() seems suspicious). Filter them out.
+    for dst, src in fullcopy.copy().items():
+        if src not in mb:
+            del fullcopy[dst]
     if fullcopy and repo.ui.debugflag:
         repo.ui.debug("  all copies found (* = to merge, ! = divergent, "
                       "% = renamed and deleted):\n")