Differences From:

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]

To:

File tools/cvs2fossil/lib/c2f_prev.tcl part of check-in [9214c11831] - Changeset handling, extended logging of how parent is determined. Fossil access, fixed importrev call to use correct workspace/repository. Fixed handling of output, stripping unwanted text, checking of output syntax. Extended logging. Added final 'rebuild'. NOTE: formation of the changesets/manifests is buggy, is not tracking unchanged files across changesets. Further not yet tracking when files have been removed. by aku on 2008-02-02 07:03:39. [view]

@@ -448,8 +448,16 @@
 	upvar 1 $sv state
 
 	struct::list assign [Getisdefault $items] isdefault lastdefaultontrunk
 
+	log write 8 csets {LOD    '$lodname'}
+	log write 8 csets { def?  $isdefault}
+	log write 8 csets { last? $lastdefaultontrunk}
+
+	foreach k [lsort [array names state]] {
+	    log write 8 csets {    $k = $state($k)}
+	}
+
 	# 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 (**)).
@@ -499,11 +507,14 @@
 	# Case (c). We find the parent LOD of our LOD and take the
 	# last changeset committed to that as our parent. If that
 	# doesn't exist we have an error on our hands.
 
-	set lodname [[[$project getsymbol $lodname] parent] name]
-	if {[info exists state($lodname)]} {
-	    return $state($lodname)
+	set plodname [[[$project getsymbol $lodname] parent] name]
+
+	log write 8 csets {pLOD   '$plodname'}
+
+	if {[info exists state($plodname)]} {
+	    return $state($plodname)
 	}
 
 	trouble internal {Unable to determine changeset parent}
 	return