#
#
# patch "rcs_import.cc"
#  from [9eb6143e03932a1d09aba93f5c5397d27e8843b7]
#    to [028eaf102e4ff0e995bf5e2e7b52827e128eca2c]
#
============================================================
--- rcs_import.cc	9eb6143e03932a1d09aba93f5c5397d27e8843b7
+++ rcs_import.cc	028eaf102e4ff0e995bf5e2e7b52827e128eca2c
@@ -2055,6 +2055,21 @@ cluster_consumer::consume_blob(cvs_blob 
 
       if (ce->alive)
         {
+          // determine the final branchname
+          cvs_branchname bname;
+          string bn;
+          if (blob.in_branch)
+            {
+              bname = blob.in_branch->branchname;
+              bn = cvs.base_branch + "." +
+                cvs.branchname_interner.lookup(blob.in_branch->branchname);
+            }
+          else
+            {
+              bname = cvs.branchname_interner.intern(cvs.base_branch);
+              bn = cvs.base_branch;
+            }
+
           shared_ptr<revision_t> rev(new revision_t());
           shared_ptr<cset> cs(new cset());
 
@@ -2070,13 +2085,6 @@ cluster_consumer::consume_blob(cvs_blob 
 
           calculate_ident(*rev, child_rid);
 
-          string bn;
-          if (blob.in_branch)
-            bn = cvs.base_branch + "." +
-              cvs.branchname_interner.lookup(blob.in_branch->branchname);
-          else
-            bn = cvs.base_branch;
-
           preps.push_back(prepared_revision(child_rid, rev, bn, blob));
 
           parent_rid = child_rid;