Fossil SCM
Bugfix in FilterSym pass. Grafting branches operated on the tags table :(
Commit
8ce7ffff2192b58eef1b2a3fd679af41093531a3
Parent
47d52d1efd967e4…
1 file changed
+2
-2
| --- tools/cvs2fossil/lib/c2f_pfiltersym.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_pfiltersym.tcl | ||
| @@ -381,11 +381,11 @@ | ||
| 381 | 381 | struct::list assign $fpn($fid) fname prname |
| 382 | 382 | |
| 383 | 383 | # Do the grafting. |
| 384 | 384 | |
| 385 | 385 | log write 4 filtersym {\[[format $fmt $n]/$mxs\] $prname : Grafting tag '$tagname' on $fname/$revnr from '$oldname' onto '$preferedname'} |
| 386 | - state run { UPDATE tag SET lod = $pid WHERE tid = $id ; } | |
| 386 | + state run { UPDATE tag SET lod = $pid WHERE tid = $id } | |
| 387 | 387 | incr n |
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | log write 3 filtersym "Reparented [nsp $n tag]" |
| 391 | 391 | |
| @@ -439,11 +439,11 @@ | ||
| 439 | 439 | struct::list assign $fpn($fid) fname prname |
| 440 | 440 | |
| 441 | 441 | # Do the grafting. |
| 442 | 442 | |
| 443 | 443 | log write 4 filtersym {\[[format $fmt $n]/$mxs\] $prname : Grafting branch '$braname' on $fname/$revnr from '$oldname' onto '$preferedname'} |
| 444 | - state run { UPDATE tag SET lod = $pid WHERE tid = $id ; } | |
| 444 | + state run { UPDATE branch SET lod = $pid WHERE bid = $id } | |
| 445 | 445 | incr n |
| 446 | 446 | } |
| 447 | 447 | |
| 448 | 448 | log write 3 filtersym "Reparented [nsp $n branch branches]" |
| 449 | 449 | return |
| 450 | 450 |
| --- tools/cvs2fossil/lib/c2f_pfiltersym.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pfiltersym.tcl | |
| @@ -381,11 +381,11 @@ | |
| 381 | struct::list assign $fpn($fid) fname prname |
| 382 | |
| 383 | # Do the grafting. |
| 384 | |
| 385 | log write 4 filtersym {\[[format $fmt $n]/$mxs\] $prname : Grafting tag '$tagname' on $fname/$revnr from '$oldname' onto '$preferedname'} |
| 386 | state run { UPDATE tag SET lod = $pid WHERE tid = $id ; } |
| 387 | incr n |
| 388 | } |
| 389 | |
| 390 | log write 3 filtersym "Reparented [nsp $n tag]" |
| 391 | |
| @@ -439,11 +439,11 @@ | |
| 439 | struct::list assign $fpn($fid) fname prname |
| 440 | |
| 441 | # Do the grafting. |
| 442 | |
| 443 | log write 4 filtersym {\[[format $fmt $n]/$mxs\] $prname : Grafting branch '$braname' on $fname/$revnr from '$oldname' onto '$preferedname'} |
| 444 | state run { UPDATE tag SET lod = $pid WHERE tid = $id ; } |
| 445 | incr n |
| 446 | } |
| 447 | |
| 448 | log write 3 filtersym "Reparented [nsp $n branch branches]" |
| 449 | return |
| 450 |
| --- tools/cvs2fossil/lib/c2f_pfiltersym.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pfiltersym.tcl | |
| @@ -381,11 +381,11 @@ | |
| 381 | struct::list assign $fpn($fid) fname prname |
| 382 | |
| 383 | # Do the grafting. |
| 384 | |
| 385 | log write 4 filtersym {\[[format $fmt $n]/$mxs\] $prname : Grafting tag '$tagname' on $fname/$revnr from '$oldname' onto '$preferedname'} |
| 386 | state run { UPDATE tag SET lod = $pid WHERE tid = $id } |
| 387 | incr n |
| 388 | } |
| 389 | |
| 390 | log write 3 filtersym "Reparented [nsp $n tag]" |
| 391 | |
| @@ -439,11 +439,11 @@ | |
| 439 | struct::list assign $fpn($fid) fname prname |
| 440 | |
| 441 | # Do the grafting. |
| 442 | |
| 443 | log write 4 filtersym {\[[format $fmt $n]/$mxs\] $prname : Grafting branch '$braname' on $fname/$revnr from '$oldname' onto '$preferedname'} |
| 444 | state run { UPDATE branch SET lod = $pid WHERE bid = $id } |
| 445 | incr n |
| 446 | } |
| 447 | |
| 448 | log write 3 filtersym "Reparented [nsp $n branch branches]" |
| 449 | return |
| 450 |