# # # patch "rcs_import.cc" # from [71e71c40ebe6117f9bfad124a3d2bd42b7969556] # to [6408cd9456d37e6f865ce13f97541dabe89ba852] # # patch "tests/importing_cvs_branches2/__driver__.lua" # from [087b4df60a32631d9d2e58c018827790049a83d3] # to [dbd13b90a55f927ecb95142c8a1d374cfa0ec757] # ============================================================ --- rcs_import.cc 71e71c40ebe6117f9bfad124a3d2bd42b7969556 +++ rcs_import.cc 6408cd9456d37e6f865ce13f97541dabe89ba852 @@ -2094,6 +2094,11 @@ blob_consumer::consume_blob(cvs_blob & b // this is only for debug information L(FL("This blob depends on the following branches:")); + if (blob.get_digest().is_commit()) + { + L(FL(" (commit: '%s')") % cvs.authorclog_interner.lookup(static_cast(**blob.begin()).authorclog)); + } + for (i = dep_branches.begin(); i != dep_branches.end(); ++i) L(FL(" branch %s") % cvs.get_branchname(static_cast(**cvs.blobs[*i].begin()).branchname)); ============================================================ --- tests/importing_cvs_branches2/__driver__.lua 087b4df60a32631d9d2e58c018827790049a83d3 +++ tests/importing_cvs_branches2/__driver__.lua dbd13b90a55f927ecb95142c8a1d374cfa0ec757 @@ -38,7 +38,7 @@ writefile("changelog.D.5", readfile("cha writefile("changelog.D.5", readfile("changelog.C.4").."fifth changelog -on branch D-\n") -- import into monotone and check presence of files -check(mtn("--branch=test", "cvs_import", "cvs-repository/test"), 0, false, false) +check(mtn("--debug", "--branch=test", "cvs_import", "cvs-repository/test"), 0, false, false) -- check if all non-empty branches were imported check(mtn("list", "branches"), 0, true, false)