#
#
# patch "rcs_import.cc"
#  from [85468e025413b3a0abd1cc2b88de9afe146dba38]
#    to [558f1b16938ca3db04bdd4bce0069106e2c58208]
# 
# patch "tests/importing_cvs_missing_delta_1/__driver__.lua"
#  from [96fc93112609cd7fe922f560d6c6fa9d89043262]
#    to [f1ee93671f102c7cc989615118c7a8dad07e13f3]
#
============================================================
--- rcs_import.cc	85468e025413b3a0abd1cc2b88de9afe146dba38
+++ rcs_import.cc	558f1b16938ca3db04bdd4bce0069106e2c58208
@@ -2190,7 +2190,7 @@ void cvs_history::index_branchpoint_symb
           if (di == r.deltas.end())
             W(F("delta for RCS version %s referenced from branch %s "
                 "is missing from file %s.")
-                % branchpoint_version % r.filename % sym);
+                % branchpoint_version % sym % r.filename);
           else
             {
               shared_ptr<rcs_delta> curr_delta = di->second;
============================================================
--- tests/importing_cvs_missing_delta_1/__driver__.lua	96fc93112609cd7fe922f560d6c6fa9d89043262
+++ tests/importing_cvs_missing_delta_1/__driver__.lua	f1ee93671f102c7cc989615118c7a8dad07e13f3
@@ -7,5 +7,5 @@ check(mtn("--branch=test", "cvs_import",
 check(get("cvs-repository"))
 
 check(mtn("--branch=test", "cvs_import", "cvs-repository"), 0, false, true)
-check(qgrep("delta for RCS version 1.1.2.1 is missing from file fileA,v", "stderr"))
+check(qgrep("delta for RCS version 1.1.2.1 referenced from branch BRANCH_FROM_UNNAMED_BRANCH is missing from file fileA,v", "stderr"))