[PATCH] cvsimport: allow remote CVS repos

diff --git a/read-tree.c b/read-tree.c
index d86cc0263c7d2e23aa88b387b1cf040e1c06d6bc..0d94fe214d4fd7b24b00f419097f79dab4889670 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -280,6 +280,12 @@ static int threeway_merge(struct cache_entry *stages[4],
                }
                /* otherwise we will apply the original rule */
        }
+       /* #14ALT */
+       if (a && b && c && same(a, b) && !same(a, c)) {
+               if (old && same(old, c))
+                       return merged_entry_allow_dirty(c, old, dst);
+               /* otherwise the regular rule applies */
+       }
        /*
         * If we have an entry in the index cache ("old"), then we want
         * to make sure that it matches any entries in stage 2 ("first