Fossil SCM
Fixed bug in the code detaching a vendor branch. Left link to removed parent dangling, and killed connection to first on branch. No more.
Commit
0adaabf11231d63b5ded188dc7fe95d987257a88
Parent
727f370c2927c07…
1 file changed
+2
-2
| --- tools/cvs2fossil/lib/c2f_file.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_file.tcl | ||
| @@ -961,12 +961,12 @@ | ||
| 961 | 961 | set vendor [$first parentbranch] |
| 962 | 962 | integrity assert {$vendor ne ""} {First NTDB revision has no branch} |
| 963 | 963 | if {[$vendor parent] eq $rev11} { |
| 964 | 964 | $rev11 removebranch $vendor |
| 965 | 965 | $rev11 removechildonbranch $first |
| 966 | - $vendor cutchild | |
| 967 | - $first cutfromparentbranch | |
| 966 | + $vendor cutbranchparent ;# bp = rev11, about to be gone | |
| 967 | + $first cutfromparentbranch ;# pb = vendor, to be a detached LOD | |
| 968 | 968 | lappend myroots $first |
| 969 | 969 | } |
| 970 | 970 | |
| 971 | 971 | # Change the type of first (typically from Change to Add): |
| 972 | 972 | $first retype add |
| 973 | 973 |
| --- tools/cvs2fossil/lib/c2f_file.tcl | |
| +++ tools/cvs2fossil/lib/c2f_file.tcl | |
| @@ -961,12 +961,12 @@ | |
| 961 | set vendor [$first parentbranch] |
| 962 | integrity assert {$vendor ne ""} {First NTDB revision has no branch} |
| 963 | if {[$vendor parent] eq $rev11} { |
| 964 | $rev11 removebranch $vendor |
| 965 | $rev11 removechildonbranch $first |
| 966 | $vendor cutchild |
| 967 | $first cutfromparentbranch |
| 968 | lappend myroots $first |
| 969 | } |
| 970 | |
| 971 | # Change the type of first (typically from Change to Add): |
| 972 | $first retype add |
| 973 |
| --- tools/cvs2fossil/lib/c2f_file.tcl | |
| +++ tools/cvs2fossil/lib/c2f_file.tcl | |
| @@ -961,12 +961,12 @@ | |
| 961 | set vendor [$first parentbranch] |
| 962 | integrity assert {$vendor ne ""} {First NTDB revision has no branch} |
| 963 | if {[$vendor parent] eq $rev11} { |
| 964 | $rev11 removebranch $vendor |
| 965 | $rev11 removechildonbranch $first |
| 966 | $vendor cutbranchparent ;# bp = rev11, about to be gone |
| 967 | $first cutfromparentbranch ;# pb = vendor, to be a detached LOD |
| 968 | lappend myroots $first |
| 969 | } |
| 970 | |
| 971 | # Change the type of first (typically from Change to Add): |
| 972 | $first retype add |
| 973 |