# # # patch "rcs_import.cc" # from [c4c3ae0c1681abae5dd4872f8fdb72ef02de79ad] # to [d8caed14e9e8b085ea87d38bfbf857278ff0225d] # ============================================================ --- rcs_import.cc c4c3ae0c1681abae5dd4872f8fdb72ef02de79ad +++ rcs_import.cc d8caed14e9e8b085ea87d38bfbf857278ff0225d @@ -300,7 +300,6 @@ public: virtual cvs_event_digest get_digest(void) const { - L(FL("digest of tag for symbol %d") % symbol); return cvs_event_digest(ET_TAG_POINT, symbol); }; }; @@ -3513,18 +3512,20 @@ blob_consumer::operator()(cvs_blob_index blob.in_branch = cvs.base_branch; else { - if (blob.get_digest().is_branch_start() || blob.get_digest().is_tag()) - if (parent_blobs.size() > 1) - { - I(false); - } - + if ((blob.get_digest().is_branch_start() || blob.get_digest().is_tag()) + && (parent_blobs.size() > 1)) + { + I(false); + } + else + { I(parent_blobs.size() == 1); blob.in_branch = cvs.blobs[*parent_blobs.begin()].in_branch; parent_rid = cvs.blobs[*parent_blobs.begin()].assigned_rid; L(FL("parent rid: %s") % parent_rid); blob.assigned_rid = parent_rid; + } } if (blob.get_digest().is_commit())