SHA1 Hash:	99004d57a3166340dc91db3c81f363a6a5003c67
Date:	2008-03-05 03:24:19
User:	aku
Comment:	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.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified tools/cvs2fossil/lib/c2f_psym.tcl from [294eabb16a] to [472799fd79].

@@ -44,22 +44,16 @@
     method id   {} { return $myid   }
 
     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