Differences From:

File tools/cvs2fossil/lib/c2f_psym.tcl part of check-in [348e45b0d6] - Added basic import of changesets. Note that this code is incomplete with regard to handling the various possible interactions between a vendor-branh and trunk. by aku on 2008-01-30 08:28:34. [view]

To:

File tools/cvs2fossil/lib/c2f_psym.tcl part of check-in [a5840849d0] - Fixed bug computing a symbol's parent. preferedparent is the voting table, not the home of the definite information. The bug caused the use of the wrong parent lod during the import of changesets. Luckily the chosen parent was not known yet, causing an abort. by aku on 2008-02-06 04:57:30. [view]

@@ -47,11 +47,16 @@
 
     method parent {} {
 	return [$myproject getsymbol [state one {
 	    SELECT S.name
-	    FROM preferedparent P, symbol S
-	    WHERE P.sid = $myid
-	    AND   S.sid = P.pid
+	    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
     }