Changeset 295

Show
Ignore:
Timestamp:
02/10/2007 01:44:37 PM
Author:
luedi
Message:

When an item is reshared into a project where it was deleted before, this item path was tracked twice as valid item pathes. This led to situations, esp. in labeling conditions, when the same item is copied twice to the same target path.

This change will recover the item in these situations, instead of recording it again.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/script/Vss2Svn/ActionHandler.pm

    r294 r295  
    11681168    my $physinfo = $gPhysInfo{$physname}; 
    11691169    if (defined $physinfo) { 
    1170         $physinfo->{parents}->{$parentphys} = {}; 
    1171         push @{ $physinfo->{order} }, $parentphys; 
     1170        # check wether this parent was previously deleted 
     1171        if (defined $physinfo->{parents}->{$parentphys} && 
     1172            defined $physinfo->{parents}->{$parentphys}->{deleted}) { 
     1173            undef $physinfo->{parents}->{$parentphys}->{deleted}; 
     1174        } 
     1175        else { 
     1176            $physinfo->{parents}->{$parentphys} = {}; 
     1177            push @{ $physinfo->{order} }, $parentphys; 
     1178        } 
    11721179    } 
    11731180}  #  End _add_parent 

PumaCode.org recommends CVSDude for fast, professional Subversion and Trac hosting:

CVSDude.com

These ads are automatically generated by Google. Revenue from these ads helps to pay for hosting this site; however, these ads do not constitute an endorsement by PumaCode.org.