Subversion Repositories DevTools

Rev

Rev 2764 | Rev 3859 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2764 Rev 3045
Line 215... Line 215...
215
    Error ("Need a Subversion Reference or URL. -help for options") unless $opt_delete;
215
    Error ("Need a Subversion Reference or URL. -help for options") unless $opt_delete;
216
}
216
}
217
 
217
 
218
#
218
#
219
#   Set up branching values
219
#   Set up branching values
220
#       mkbranck    - Create if not exists. Error if it exists
220
#       mkbranch    - Create if not exists. Error if it exists
221
#       branch      - Error if not exists
221
#       branch      - Error if not exists
222
#
222
#
223
if ( $opt_mkbranch ) {
223
if ( $opt_mkbranch ) {
224
    $opt_branch = $opt_mkbranch;
224
    $opt_branch = $opt_mkbranch;
225
    $opt_mkbranch = 1;
225
    $opt_mkbranch = 1;
Line 632... Line 632...
632
                        'require' =>   (! $opt_mkbranch),
632
                        'require' =>   (! $opt_mkbranch),
633
                        'available' => (  $opt_mkbranch),
633
                        'available' => (  $opt_mkbranch),
634
                        );
634
                        );
635
 
635
 
636
        #
636
        #
637
        #   If using an existing branch, then set up the name
637
        #   If using an existing branch, then:
638
        #   of the source.
638
        #       Set up the name of the source
-
 
639
        #       Do NOT import tag changes - we will be extracting the HEAD of the branch
639
        #
640
        #
640
        $view_tag = $branch if ( ! $opt_mkbranch );
641
        if ( ! $opt_mkbranch )
-
 
642
        {
-
 
643
            $view_tag = $branch;
-
 
644
            $update_tagsChanges = 0;
-
 
645
        }
641
    }
646
    }
642
 
647
 
643
    #
648
    #
644
    #   Perform delayed delete of any existign view
649
    #   Perform delayed delete of any existign view
645
    #   The process has been delayed as much as possible - incase other tests
650
    #   The process has been delayed as much as possible - in case other tests fail
646
    #   fail
-
 
647
    #
651
    #
648
    delete_view();
652
    delete_view();
649
 
653
 
650
    #
654
    #
651
    #   Create the workspace
655
    #   Create the workspace
Line 1175... Line 1179...
1175
#       export them into the workspace
1179
#       export them into the workspace
1176
#
1180
#
1177
#   If we are creating a workspace that we are about to branch, then
1181
#   If we are creating a workspace that we are about to branch, then
1178
#   we use 'switch' to copy in the new file
1182
#   we use 'switch' to copy in the new file
1179
#   Otherwise, use a 'co -export'. If we use a switch, then the files
1183
#   Otherwise, use a 'co -export'. If we use a switch, then the files
1180
#   that have been switched in cannot be commit if changed as they will
1184
#   that have been switched in cannot be commited if changed as they will
1181
#   be within the 'tags' area.
1185
#   be within the 'tags' area.
1182
#
1186
#
1183
# Inputs          : None
1187
# Inputs          : None
1184
#                   Globals
1188
#                   Globals
1185
#
1189
#
Line 1221... Line 1225...
1221
                Error ("importTagChanges. Unexpected format of filename: $srcFile",
1225
                Error ("importTagChanges. Unexpected format of filename: $srcFile",
1222
                       "Possible cause: Incorrect tag placement");
1226
                       "Possible cause: Incorrect tag placement");
1223
            }
1227
            }
1224
            my $tfile = $workSpace . $1;
1228
            my $tfile = $workSpace . $1;
1225
 
1229
 
1226
            if ( $opt_branch )
1230
            if ( $opt_mkbranch )
1227
            {
1231
            {
1228
                $svnSession->SvnSwitch ($sfile, $tfile);
1232
                $svnSession->SvnSwitch ($sfile, $tfile);
1229
            }
1233
            }
1230
            else
1234
            else
1231
            {
1235
            {