#
#
# patch "rcs_import.cc"
#  from [b7d48bdcdcad2e5eaeaef7d57dea7706be1aa0f8]
#    to [97183045aee1d681b891a0ca33913671059777a7]
#
============================================================
--- rcs_import.cc	b7d48bdcdcad2e5eaeaef7d57dea7706be1aa0f8
+++ rcs_import.cc	97183045aee1d681b891a0ca33913671059777a7
@@ -3990,7 +3990,14 @@ resolve_intra_blob_conflicts_for_blob(cv
               {
                 cvs_commit *ci = (cvs_commit*) (*i);
                 cvs_commit *cj = (cvs_commit*) (*j);
-                I(ci->rcs_version == cj->rcs_version);
+
+                // Hum.. the events may be in different branches, and thus
+                // have the same author, changelog and timestamp for pretty
+                // valid reasons. Skip in those cases, and only merge
+                // events which are really the same, i.e. by Attic and real
+                // file.
+                if (ci->rcs_version != cj->rcs_version)
+                  continue;
               }
 
             // let the first take over its dependencies...