Subversion Repositories DevTools

Rev

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

Rev 2652 Rev 2757
Line 852... Line 852...
852
            if ( $opt_mergePaths )
852
            if ( $opt_mergePaths )
853
            {
853
            {
854
                my $discard = 1;
854
                my $discard = 1;
855
                foreach ( split(',', $opt_mergePaths) )
855
                foreach ( split(',', $opt_mergePaths) )
856
                {
856
                {
-
 
857
                    if ( $_ eq '+' )
-
 
858
                    {
-
 
859
                        if ( ($file =~ tr~/~/~) eq 0 )
-
 
860
                        {
-
 
861
                            $discard = 0;
-
 
862
                            last;
-
 
863
                        }
-
 
864
                    }
857
                    if ( $file =~ m~^$_/~ )
865
                    elsif ( $file =~ m~^$_/~ )
858
                    {
866
                    {
859
                        $discard = 0;
867
                        $discard = 0;
860
                        last;
868
                        last;
861
                    }
869
                    }
862
                }
870
                }
863
                Verbose("Not Importing: $file") if ( $discard ) ;
871
                Verbose0("Not Importing: $file") if ( $discard ) ;
864
                next if ( $discard );
872
                next if ( $discard );
865
            }
873
            }
866
 
874
 
867
            my $src = "$opt_dir/$file";
875
            my $src = "$opt_dir/$file";
868
            my $target = "$opt_workdir/$file";
876
            my $target = "$opt_workdir/$file";