Fossil SCM
Bugfix. In pass 5, loading the changesets used the type codes instead of the type names. Modified the SQL selecting the data to return the proper names.
Commit
341d96be210caf63eaedfc3387473f77ec49282a
Parent
258366a37a382ae…
1 file changed
+3
-2
| --- tools/cvs2fossil/lib/c2f_pinitcsets.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl | ||
| @@ -104,12 +104,13 @@ | ||
| 104 | 104 | state reading changeset |
| 105 | 105 | state reading csrevision |
| 106 | 106 | state reading cstype |
| 107 | 107 | |
| 108 | 108 | foreach {id pid cstype srcid} [state run { |
| 109 | - SELECT C.cid, C.pid, C.type, C.src | |
| 110 | - FROM changeset C | |
| 109 | + SELECT C.cid, C.pid, CS.name, C.src | |
| 110 | + FROM changeset C, cstype CS | |
| 111 | + WHERE C.type = CS.tid | |
| 111 | 112 | ORDER BY C.cid |
| 112 | 113 | }] { |
| 113 | 114 | set r [project::rev %AUTO% [repository projectof $pid] $cstype $srcid [state run { |
| 114 | 115 | SELECT C.rid |
| 115 | 116 | FROM csrevision C |
| 116 | 117 |
| --- tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| @@ -104,12 +104,13 @@ | |
| 104 | state reading changeset |
| 105 | state reading csrevision |
| 106 | state reading cstype |
| 107 | |
| 108 | foreach {id pid cstype srcid} [state run { |
| 109 | SELECT C.cid, C.pid, C.type, C.src |
| 110 | FROM changeset C |
| 111 | ORDER BY C.cid |
| 112 | }] { |
| 113 | set r [project::rev %AUTO% [repository projectof $pid] $cstype $srcid [state run { |
| 114 | SELECT C.rid |
| 115 | FROM csrevision C |
| 116 |
| --- tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| @@ -104,12 +104,13 @@ | |
| 104 | state reading changeset |
| 105 | state reading csrevision |
| 106 | state reading cstype |
| 107 | |
| 108 | foreach {id pid cstype srcid} [state run { |
| 109 | SELECT C.cid, C.pid, CS.name, C.src |
| 110 | FROM changeset C, cstype CS |
| 111 | WHERE C.type = CS.tid |
| 112 | ORDER BY C.cid |
| 113 | }] { |
| 114 | set r [project::rev %AUTO% [repository projectof $pid] $cstype $srcid [state run { |
| 115 | SELECT C.rid |
| 116 | FROM csrevision C |
| 117 |