Overview
| SHA1 Hash: | a5840849d0e3ceb04bf6f5b922d4d1fddc0e82ff |
|---|---|
| Date: | 2008-02-06 04:57:30 |
| User: | aku |
| Comment: | 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. |
| Timelines: | ancestors | descendants | both | trunk |
| Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[hide diffs]Modified tools/cvs2fossil/lib/c2f_psym.tcl from [e42d2c8c01] to [2ded920ae5].
@@ -46,13 +46,18 @@
method istrunk {} { return 0 }
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
}
# # ## ### ##### ######## #############