Fossil SCM
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.
Commit
99004d57a3166340dc91db3c81f363a6a5003c67
Parent
ae53becda49638f…
1 file changed
+5
-11
+5
-11
| --- tools/cvs2fossil/lib/c2f_psym.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_psym.tcl | ||
| @@ -44,22 +44,16 @@ | ||
| 44 | 44 | method id {} { return $myid } |
| 45 | 45 | |
| 46 | 46 | method istrunk {} { return 0 } |
| 47 | 47 | |
| 48 | 48 | method parent {} { |
| 49 | - return [$myproject getsymbol [state one { | |
| 50 | - SELECT S.name | |
| 51 | - FROM tag T, symbol S | |
| 52 | - WHERE T.sid = $myid | |
| 53 | - AND S.sid = T.lod | |
| 54 | - UNION | |
| 55 | - SELECT S.name | |
| 56 | - FROM branch B, symbol S | |
| 57 | - WHERE B.sid = $myid | |
| 58 | - AND S.sid = B.lod | |
| 49 | + return [$myproject getsymbol [state run { | |
| 50 | + SELECT S.name | |
| 51 | + FROM preferedparent P, symbol S | |
| 52 | + WHERE P.sid = $myid | |
| 53 | + AND S.sid = P.pid | |
| 59 | 54 | }]] |
| 60 | - return | |
| 61 | 55 | } |
| 62 | 56 | |
| 63 | 57 | # # ## ### ##### ######## ############# |
| 64 | 58 | ## Symbol type |
| 65 | 59 | |
| 66 | 60 |
| --- tools/cvs2fossil/lib/c2f_psym.tcl | |
| +++ tools/cvs2fossil/lib/c2f_psym.tcl | |
| @@ -44,22 +44,16 @@ | |
| 44 | method id {} { return $myid } |
| 45 | |
| 46 | method istrunk {} { return 0 } |
| 47 | |
| 48 | method parent {} { |
| 49 | return [$myproject getsymbol [state one { |
| 50 | SELECT S.name |
| 51 | FROM tag T, symbol S |
| 52 | WHERE T.sid = $myid |
| 53 | AND S.sid = T.lod |
| 54 | UNION |
| 55 | SELECT S.name |
| 56 | FROM branch B, symbol S |
| 57 | WHERE B.sid = $myid |
| 58 | AND S.sid = B.lod |
| 59 | }]] |
| 60 | return |
| 61 | } |
| 62 | |
| 63 | # # ## ### ##### ######## ############# |
| 64 | ## Symbol type |
| 65 | |
| 66 |
| --- tools/cvs2fossil/lib/c2f_psym.tcl | |
| +++ tools/cvs2fossil/lib/c2f_psym.tcl | |
| @@ -44,22 +44,16 @@ | |
| 44 | method id {} { return $myid } |
| 45 | |
| 46 | method istrunk {} { return 0 } |
| 47 | |
| 48 | method parent {} { |
| 49 | return [$myproject getsymbol [state run { |
| 50 | SELECT S.name |
| 51 | FROM preferedparent P, symbol S |
| 52 | WHERE P.sid = $myid |
| 53 | AND S.sid = P.pid |
| 54 | }]] |
| 55 | } |
| 56 | |
| 57 | # # ## ### ##### ######## ############# |
| 58 | ## Symbol type |
| 59 | |
| 60 |