Skip to content

Commit

Permalink
Fixed bug in matching configured vs detected branches
Browse files Browse the repository at this point in the history
  • Loading branch information
martinlong1978 committed Apr 14, 2011
1 parent 03aead4 commit 25b3ffb
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions svnExport.pl
Expand Up @@ -9,13 +9,11 @@
my $SVN_ROOT="$SYNC_BASE/workingdata";
my $COMMIT_MESG="$SVN_ROOT/messages";
my $REMOTE="origin";
my $SVN_BASE_URL;
my @BRANCH_ORDER;
my $TRUNK;

# These are loaded per-project
my @BRANCH_ORDER;
my $SVN_BASE_URL;
my $TRUNK;

sub branchfromparent
{
Expand Down Expand Up @@ -127,7 +125,7 @@ sub processproject
my @allbranches=<REFS>;
close(REFS);

my @branches=();
my @branches;

for my $branch (@BRANCH_ORDER)
{
Expand All @@ -138,7 +136,7 @@ sub processproject
{
chomp($branch);
$branch=~s/$REMOTE\/(.*)/\1/;
if(!grep($branch eq "$REMOTE/$_", @BRANCH_ORDER))
if(!grep($branch eq "$_", @BRANCH_ORDER))
{
push(@branches, $branch);
}
Expand Down

0 comments on commit 25b3ffb

Please sign in to comment.