Differences From:

File tools/cvs2fossil/lib/c2f_file.tcl part of check-in [38b967dcf5] - Merge aku's CVS import changes into the main line. Fix a small bug in diff.c. by drh on 2007-11-17 00:29:42. Also file tools/cvs2fossil/lib/c2f_file.tcl part of check-in [6f8667b03e] - Added code creating aggregate symbol statistics. This completes pass 2 (CollRev). by aku on 2007-10-31 03:44:01. [view]

To:

File tools/cvs2fossil/lib/c2f_file.tcl part of check-in [930ec162ce] - Fixed the calculation of possible parents for a detached NTDB. Has to be trunk. The symbols were skipped before, causing them to have no parents at all later on, forcing an abort after CollateSymbols. Added some high verbosity log commands for debugging of this area. by aku on 2007-11-22 06:03:47. [view]

@@ -1051,8 +1051,14 @@
 
 	    if {[$root hasparentbranch]} {
 		# Note lod == [$root parentbranch]
 		$lod possibleparents
+	    } elseif {![$lod istrunk] && [$root isondefaultbranch]} {
+		# This is the root revision of a detached NTDB. We
+		# have to manually set the only possible parent for
+		# this LOD, the trunk itself.
+
+		[$lod symbol] possibleparent $mytrunk
 	    }
 
 	    # For the revisions in the line we register their branches
 	    # and tags as blockers for the lod, and update the type