Differences From:

File tools/cvs2fossil/lib/c2f_fsym.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_fsym.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_fsym.tcl part of check-in [7ab490df24] - Extended pass 2, save branch positions, needed for pass 4, and added optype table to have the revision opcodes available in the state as well. by aku on 2007-11-07 06:19:13. [view]

@@ -170,13 +170,8 @@
 
     method persist {} {
 	# Save the information we need after the collection pass.
 
-	# NOTE: mybranchposition is currently not saved. This can
-	# likely be figured out later from the id itself. If yes, we
-	# can also get rid of 'sortbranches' (cvs::file) and the
-	# associated information.
-
 	set fid [$myfile   id]
 	set sid [$mysymbol id]
 	set lod [$mylod    id]
 
@@ -194,10 +189,10 @@
 		lappend map @F@ [expr { ($mybranchchild eq "") ? "NULL" : [$mybranchchild id] }]
 
 		set rid [$mybranchparent id]
 		set cmd {
-		    INSERT INTO branch ( bid,   fid,  lod,  sid,  root, first, bra )
-		    VALUES             ($myid, $fid, $lod, $sid, $rid,  @F@,  $mynr);
+		    INSERT INTO branch ( bid,   fid,  lod,  sid,  root, first, bra,  pos              )
+		    VALUES             ($myid, $fid, $lod, $sid, $rid,  @F@,  $mynr, $mybranchposition);
 		}
 		state transaction {
 		    state run [string map $map $cmd]
 		}