Subversion Repositories DevTools

Rev

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

Rev 3263 Rev 3890
Line 795... Line 795...
795 
                my $keep = 0;
 795 
                my $keep = 0;
796 
                foreach ( @newTldPaths )
 796 
                foreach ( @newTldPaths )
797 
                {
 797 
                {
798 
                    if ( $file =~ m~^$_/~ )
 798 
                    if ( $file =~ m~^$_/~ )
799 
                    {
 799 
                    {
800 
                        Verbose("Not deleting: $file");
 800 
                        Verbose0("Merge Retain: $file");
801 
                        $keep = 1;
 801 
                        $keep = 1;
802 
                        last;
 802 
                        last;
803 
                    }
 803 
                    }
804 
                }
 804 
                }
805 
 
 805 
 
Line 812... Line 812...
812 
                    if ( m~(.+/)\*\*$~ )
 812 
                    if ( m~(.+/)\*\*$~ )
813 
                    {
 813 
                    {
814 
                        my $base = $1;
 814 
                        my $base = $1;
815 
                        if ( $file =~ m~^$base~ )
 815 
                        if ( $file =~ m~^$base~ )
816 
                        {
 816 
                        {
817 
                            Verbose("Not deleting: $file");
 817 
                            Verbose0("Merge Retain: $file");
818 
                            $keep = 1;
 818 
                            $keep = 1;
819 
                            last;
 819 
                            last;
820 
                        }
 820 
                        }
821 
                    }
 821 
                    }
822 
                }
 822 
                }
823
823
824 
                next if ($keep);
 824 
                next if ($keep);
825 
            }
 825 
            }
826 
 
 826 
 
827 
            Verbose ("Removing $file");
 827 
            Verbose0 ("Removing $file");
828 
            $filesDeleted++ unless ( $file =~ m~/$~ );
 828 
            $filesDeleted++ unless ( $file =~ m~/$~ );
829 
            $dirsDeleted++ if ( $file =~ m~/$~ );
 829 
            $dirsDeleted++ if ( $file =~ m~/$~ );
830 
            unlink "$opt_workdir/$file";
 830 
            unlink "$opt_workdir/$file";
831 
            push @processedFiles, $file;
 831 
            push @processedFiles, $file;
832 
        }
 832 
        }