Differences From:

File tools/cvs2fossil/lib/c2f_psym.tcl part of check-in [f637d42206] - Updated my notes regarding memory usage. Converted more locations to incremental query processing via 'state foreachrow', now throughout the importer. by aku on 2008-02-24 18:01:40. [view]

To:

File tools/cvs2fossil/lib/c2f_psym.tcl part of check-in [99004d57a3] - Reverting the change of a5840849d0. Use of 'preferedparent' is ok. The problem I attempted to fix is properly fixed by looking at the branch changesets as well during import, and by acknowledging that there can be branches which have no changesets committed to them. by aku on 2008-03-05 03:24:19. [view]

@@ -45,20 +45,14 @@
 
     method istrunk {} { return 0 }
 
     method parent {} {
-	return [$myproject getsymbol [state one {
-	    SELECT S.name
-	    FROM tag T, symbol S
-	    WHERE T.sid = $myid
-	    AND   S.sid = T.lod
-	UNION
-	    SELECT S.name
-	    FROM branch B, symbol S
-	    WHERE B.sid = $myid
-	    AND   S.sid = B.lod
-	}]]
-	return
+        return [$myproject getsymbol [state run {
+ 	    SELECT S.name
+	    FROM preferedparent P, symbol S
+	    WHERE P.sid = $myid
+	    AND   S.sid = P.pid
+	}]]
     }
 
     # # ## ### ##### ######## #############
     ## Symbol type