----------------------------------------------------------------------
r1113:  clkao | 2004-09-22T22:17:21.739422Z

When queuing placeholder revs, use the proper rev_data to
calculate rev_mode.

This fixes a bug that a file is added on trunk, vcp copied.
Merged to a branch, and then vcp --continue will break.

----------------------------------------------------------------------
--- local/lib/VCP/Source/cvs.pm  (revision 1112)
+++ local/lib/VCP/Source/cvs.pm  (revision 1113)
@@ -771,6 +771,7 @@ sub queue_parsed_revs {
 
       $file_data->{revs}->{$rev_id} = $r;  ## TODO: try deleting this.
       for my $branch_rev_id ( @{$rev->{branches}} ) {
+         $branch_rev_id =~ s{\.\d+\z}{.0};
          ## Create branch revs (placeholders) with appropriate
          ## branch_ids from RTAGS.
          my $placeholder_rev = {
@@ -782,14 +783,12 @@ sub queue_parsed_revs {
             comment         => undef,
             previous_rev_id => $rev_id,
          };
-         $placeholder_rev->{rev_id} =~ s{\.\d+\z}{.0};
 
          $self->compute_branch_metadata( $file_data, $placeholder_rev );
 
-         my $mode = $self->rev_mode( $rev->{filebranch_id}, $rev_id );
+         my $mode = $self->rev_mode( $placeholder_rev->{filebranch_id}, $branch_rev_id );
          next unless $mode;
-         $rev->{mode} = $mode;
-
+         $placeholder_rev->{mode} = $mode;
          $placeholder_rev->{comment} =
             "[vcp] create branch '$placeholder_rev->{branch_id}'";
          $self->_create_rev( $file_data, $placeholder_rev );