Differences From:

File tools/cvs2fossil/lib/c2f_prev.tcl part of check-in [e8efbc317a] - Reworked the code determining the parent of the currently committed changeset. It should now handle the transition from vendor branch to trunk correctly. by aku on 2008-02-01 05:25:03. [view]

To:

File tools/cvs2fossil/lib/c2f_prev.tcl part of check-in [b405f4fc04] - Fix use (scoping) of revision items when looking for vendor branch data. by aku on 2008-02-02 05:07:20. [view]

@@ -416,9 +416,9 @@
 
 	set uuid [Updatestate state $lodname \
 		      [$repository importrevision [$self str] \
 			   $user $message $date \
-			   [Getparent state $lodname $myproject] \
+			   [Getparent state $lodname $myproject $myitems] \
 			   [Getrevisioninfo $myitems]]]
 
 	# Remember the whole changeset / uuid mapping, for the tags.
 
@@ -443,12 +443,12 @@
 	}
 	return $revisions
     }
 
-    proc Getparent {sv lodname project} {
+    proc Getparent {sv lodname project items} {
 	upvar 1 $sv state
 
-	struct::list assign [Getisdefault $myitems] isdefault lastdefaultontrunk
+	struct::list assign [Getisdefault $items] isdefault lastdefaultontrunk
 
 	# See (a) below, we have to remember if the changeset is last
 	# on vendor branch also belonging to trunk even if we find a
 	# parent in the state. The caller will later (after import)