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 [66235f2430] - Updated the copyright information of all files touched in the new year. by aku on 2008-02-06 05:04:12. Also file tools/cvs2fossil/lib/c2f_psym.tcl part of check-in [6b78df3861] - Merge in changes from Andreas's branch. by drh on 2008-02-08 21:52:21. [view]

@@ -1,7 +1,7 @@
 ## -*- tcl -*-
 # # ## ### ##### ######## ############# #####################
-## Copyright (c) 2007 Andreas Kupries.
+## Copyright (c) 2007-2008 Andreas Kupries.
 #
 # This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution.
 #
@@ -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
     }