Differences From:

File tools/cvs2fossil/lib/c2f_pcollsym.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_pcollsym.tcl part of check-in [d314894b9a] - Extended comment. by aku on 2007-11-06 04:55:29. [view]

To:

File tools/cvs2fossil/lib/c2f_pcollsym.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]

@@ -219,10 +219,10 @@
 	#          selections. Note that we ignore excluded symbol, we
 	#          do not care about their prefered parents and do not
 	#          attempt to compute them.
 
-	foreach {s p sname pname prname} [state run {
-	    SELECT   S.sid, P.pid, S.name, SB.name, PR.name
+	foreach {s p sname pname prname votes} [state run {
+	    SELECT   S.sid, P.pid, S.name, SB.name, PR.name, P.n
 	    FROM     symbol S, parent P, symbol SB, project PR
 	    WHERE    S.sid = P.sid
 	    AND      P.pid = SB.sid
 	    AND      S.pid = PR.pid
@@ -233,8 +233,10 @@
 	    -- symbol.  This parent will have the max number of votes
 	    -- for its symbol and will be the earliest created branch
 	    -- possible among all with many votes.
 	}] {
+	    log write 9 pcollsym "Voting $votes for Parent($sname) = $pname"
+
 	    set prefered($s) [list $p $sname $pname $prname]
 	}
 
 	# Phase II: Write the found preferences back into the table