Changeset 333
- Timestamp:
- 10/30/2007 11:19:56 PM
- Files:
-
- trunk/script/Vss2Svn/Dumpfile.pm (modified) (1 diff)
- trunk/script/Vss2Svn/Dumpfile/LabelMapper.pm (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/script/Vss2Svn/Dumpfile.pm
r332 r333 617 617 618 618 if (defined $self->{label_mapper}) { 619 my $mapping = $self->{label_mapper}->remap ($main::gCfg{labeldir}, $label); 620 $labeldir = $mapping->{replacement} if $mapping->{is_labeldir}; 621 $label = $mapping->{replacement} unless $mapping->{is_labeldir}; 619 $labeldir = $self->{label_mapper}->remap ($main::gCfg{labeldir}, $label); 622 620 } 623 621 $labeldir =~ s:\\:/:g; trunk/script/Vss2Svn/Dumpfile/LabelMapper.pm
r332 r333 28 28 29 29 30 my $retval = (); 31 $retval->{is_labeldir} = 1; 32 $retval->{replacement} = $labeldir; 30 my $retval = $labeldir; 33 31 34 32 # we need to reset the following each enumeration if we aborted the … … 39 37 while (($label_path, $remap) = each %{ $self->{labels} }) { 40 38 if ( $label =~ /$label_path/) { 41 $retval->{replacement} = $remap->[0];42 $retval ->{is_labeldir} = ($remap->[0] =~ m:^/:);39 # N.B. This might be the root project, so $labeldir might need to be be present? 40 $retval = ($remap->[0] =~ m:^/:) ? $remap->[0] : ($labeldir . "/" . $remap->[0]); 43 41 last; 44 42 }
