Differences From:

File tools/cvs2fossil/lib/c2f_prev.tcl part of check-in [770a9b576a] - Completed pass 7, breaking dependency cycles over symbol changesets. Moved the bulk of the cycle breaker code into its own class as it was common to the passes 6 and 7, and updated the two passes accordingly. Added code to load the changeset counter from the state to start properly. by aku on 2007-11-16 04:17:30. [view]

To:

File tools/cvs2fossil/lib/c2f_prev.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_prev.tcl part of check-in [96b7bfb834] - Added convenience command to the state package when the sql returns a single row. Added more statistics about revisions, tags, branches, symbols, changesets to various passes. by aku on 2007-11-16 08:32:40. [view]

@@ -143,9 +143,9 @@
 		# consideration, for documentation later.
 
 		set breaks($best) $cross($best)
 
-		log write 6 csets "Best break @ $best, cuts [nsp $cross($best) dependency dependencies]"
+		log write 6 csets "Best break @ $best, cutting [nsp $cross($best) dependency dependencies]"
 
 		# Note: The value of best is an abolute location in
 		# myrevisions. Use the start of current to make it an
 		# index absolute to current.
@@ -287,11 +287,9 @@
     }
 
     typemethod loadcounter {} {
 	# Initialize the counter from the state
-	set mycounter [lindex [state run {
-	    SELECT MAX(cid) FROM changeset
-	}] 0]
+	set mycounter [state one { SELECT MAX(cid) FROM changeset }]
 	return
     }
 
     proc PullInternalSuccessorRevisions {dv revisions} {