# # # patch "rcs_import.cc" # from [4781d0f2bfb9b7397b707ce96375cb85715450a7] # to [3b148bdfa7d5881a3b572b2946f0974598257d48] # ============================================================ --- rcs_import.cc 4781d0f2bfb9b7397b707ce96375cb85715450a7 +++ rcs_import.cc 3b148bdfa7d5881a3b572b2946f0974598257d48 @@ -3863,6 +3863,7 @@ blob_consumer::merge_parents_for_artific revision_id wanted_rid = i->second; file_path pth = file_path_internal(cvs.path_interner.lookup(ev->path)); + L(FL(" handling file %s") % pth); if (wanted_rid == right_rid) { @@ -3932,7 +3933,6 @@ blob_consumer::merge_parents_for_artific else if (wanted_rid == left_rid) { L(FL(" using left revision for file '%s'") % pth); - I(merged_roster.has_node(pth)); } else {