SHA1 Hash:	b405f4fc04a48ff8ede5e58e23a0889661ace964
Date:	2008-02-02 05:07:20
User:	aku
Comment:	Fix use (scoping) of revision items when looking for vendor branch data.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified tools/cvs2fossil/lib/c2f_prev.tcl from [301208ccef] to [fd889684d2].

@@ -415,11 +415,11 @@
 	# uuids and printable data.
 
 	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.
 
 	state run {
@@ -442,14 +442,14 @@
 	    lappend revisions $frid $path $fname/$revnr
 	}
 	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)
 	# make us the first trunk changeset in the state (See (**)).