Changeset 298

Timestamp:

02/10/2007 01:55:22 PM

Author:

luedi

Message:

track the ancestors of branched items. This is necessary in branch/pin situations, where we pin to a version prior to the branch. Since the branch itself does no have a valid path for versions prior to the branch point, we need to ask the ancestor for a valid path.

Files:

• trunk/script/Vss2Svn/ActionHandler.pm (modified) (3 diffs)
• trunk/script/Vss2Svn/Dumpfile.pm (modified) (1 diff)

trunk/script/Vss2Svn/ActionHandler.pm

@@ -127 +127 @@
-#         sharedphys => [],
-         parents    => {},
+         first_version => $version,
-         last_version => $version,
-         orphaned   => $orphaned,
@@ -374 +375 @@
-
-    # Now treat the new entry as a new addition
-
+
+
+
+
+
+
+
+
+
+
+
-
-#    # Now create a new entry for this branched item
@@ -1121 +1132 @@
-    my($self, $physname, $parentphys, $version) = @_;
-    
+    # 0.) If the version we are looking for is prior to the first version of this
+    #     item (e.g in a branch / Pin situation), we need to check the ancestor
+    my $physinfo = $gPhysInfo{$physname};
+    if (defined $physinfo &&
+        $version < $physinfo->{first_version}) {
+        return $self->_get_valid_path ($physinfo->{ancestor}, $parentphys, $version);
+    }
+    
-    # 1.) We first check for non-deleted contexts, even though these item pathes 
-    #     are valid. A deleted context means, that an item existed in this context 

trunk/script/Vss2Svn/Dumpfile.pm

@@ -364 +364 @@
-
-    # branching is a no-op in SVN
+    
+    # since it is possible, that we refer to version prior to the branch later, we
+    # need to copy all internal information about the ancestor to the child.
+    if (defined $data->{info}) {
+        $gVersion{$data->{physname}} = $gVersion{$data->{info}};
+    }
-
-#    # if the file is copied later, we need to track, the revision of this branch