Fossil SCM
Updated method 'drop' of changesets, the in-memory parts have migrated to 'destroy' as part of the work on pass InitCSets.
Commit
8dd5afbc80e13c1c0bcd1f9b0868efae9bf943a3
Parent
e71e4d3193f91e9…
1 file changed
-8
| --- tools/cvs2fossil/lib/c2f_prev.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | ||
| @@ -214,18 +214,10 @@ | ||
| 214 | 214 | DELETE FROM csitem WHERE cid = $myid; |
| 215 | 215 | DELETE FROM cssuccessor WHERE cid = $myid; |
| 216 | 216 | } |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | - UnmapItems $mytype $myitems | |
| 220 | - unset myidmap($myid) | |
| 221 | - | |
| 222 | - set pos [lsearch -exact $mychangesets $self] | |
| 223 | - set mychangesets [lreplace $mychangesets $pos $pos] | |
| 224 | - set pos [lsearch -exact $mytchangesets($mytype) $self] | |
| 225 | - set mytchangesets($mytype) [lreplace $mytchangesets($mytype) $pos $pos] | |
| 226 | - | |
| 227 | 219 | # Return the list of predecessors so that they can be adjusted. |
| 228 | 220 | return [struct::list map [state run { |
| 229 | 221 | SELECT cid |
| 230 | 222 | FROM cssuccessor |
| 231 | 223 | WHERE nid = $myid |
| 232 | 224 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | |
| @@ -214,18 +214,10 @@ | |
| 214 | DELETE FROM csitem WHERE cid = $myid; |
| 215 | DELETE FROM cssuccessor WHERE cid = $myid; |
| 216 | } |
| 217 | } |
| 218 | |
| 219 | UnmapItems $mytype $myitems |
| 220 | unset myidmap($myid) |
| 221 | |
| 222 | set pos [lsearch -exact $mychangesets $self] |
| 223 | set mychangesets [lreplace $mychangesets $pos $pos] |
| 224 | set pos [lsearch -exact $mytchangesets($mytype) $self] |
| 225 | set mytchangesets($mytype) [lreplace $mytchangesets($mytype) $pos $pos] |
| 226 | |
| 227 | # Return the list of predecessors so that they can be adjusted. |
| 228 | return [struct::list map [state run { |
| 229 | SELECT cid |
| 230 | FROM cssuccessor |
| 231 | WHERE nid = $myid |
| 232 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | |
| @@ -214,18 +214,10 @@ | |
| 214 | DELETE FROM csitem WHERE cid = $myid; |
| 215 | DELETE FROM cssuccessor WHERE cid = $myid; |
| 216 | } |
| 217 | } |
| 218 | |
| 219 | # Return the list of predecessors so that they can be adjusted. |
| 220 | return [struct::list map [state run { |
| 221 | SELECT cid |
| 222 | FROM cssuccessor |
| 223 | WHERE nid = $myid |
| 224 |