Overview
| SHA1 Hash: | f7cca3f082ea5a47499da3a26a0bc113eee2159a |
|---|---|
| Date: | 2007-12-02 06:17:59 |
| User: | aku |
| Comment: | Fix table linkage in query, and duplicated conditions :( |
| 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_prev.tcl from [a4cf35790a] to [9c2b1c4480].
@@ -1077,19 +1077,19 @@
return [state run "
SELECT C.cid
FROM revision R, csitem CI, changeset C
WHERE R.rid IN $theset -- Restrict to revisions of interest
AND R.child IS NOT NULL -- Has primary child
- AND CI.iid = R.rid
+ AND CI.iid = R.child
AND C.cid = CI.cid
AND C.type = 0
UNION
SELECT C.cid
FROM revision R, revisionbranchchildren B, csitem CI, changeset C
WHERE R.rid IN $theset -- Restrict to revisions of interest
AND R.rid = B.rid -- Select subset of branch children
- AND CI.iid = R.rid
+ AND CI.iid = B.brid
AND C.cid = CI.cid
AND C.type = 0
UNION
SELECT C.cid
FROM revision R, revision RA, csitem CI, changeset C
@@ -1096,14 +1096,11 @@
WHERE R.rid IN $theset -- Restrict to revisions of interest
AND R.isdefault -- Restrict to NTDB
AND R.dbchild IS NOT NULL -- and last NTDB belonging to trunk
AND RA.rid = R.dbchild -- Go directly to trunk root
AND RA.child IS NOT NULL -- Has primary child.
- AND CI.iid = R.rid
- AND C.cid = CI.cid
- AND C.type = 0
- AND CI.iid = R.rid
+ AND CI.iid = RA.child
AND C.cid = CI.cid
AND C.type = 0
UNION
SELECT C.cid
FROM revision R, tag T, csitem CI, changeset C