# # # patch "rcs_import.cc" # from [fbd5397f5b6fb8e2529e3bfddeec575655e5775b] # to [dbe5c8efb482a974a98114211915ebaad688bed9] # ============================================================ --- rcs_import.cc fbd5397f5b6fb8e2529e3bfddeec575655e5775b +++ rcs_import.cc dbe5c8efb482a974a98114211915ebaad688bed9 @@ -3722,7 +3722,16 @@ blob_consumer::create_artificial_revisio L(FL("creating artificial revision for %d parents.") % parent_blobs.size()); - // erase ancestors + // While a blob in our graph can have multiple ancestors, which depend on + // each other, monotone cannot represent that. Instead, we have to remove + // all ancestors from the set. I.e.: + // + // A ___, A + // | \ | + // | | => | + // v v v + // B -> blob B -> blob + set parent_rids; for (set::iterator i = parent_blobs.begin(); i != parent_blobs.end(); ++i)