Fossil SCM
Restructured the code handling NTBD in ExcludeBranch a bit to prevent the asserts in GraftNTDB2Trunk to bail out.
Commit
e94b52b6f2fd7a5ba59708d7c5dd49325f69e0e8
Parent
9f3fd3ec4b65c65…
1 file changed
+3
-2
| --- tools/cvs2fossil/lib/c2f_file.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_file.tcl | ||
| @@ -853,20 +853,21 @@ | ||
| 853 | 853 | # truly on a branch and have to be excluded. The following |
| 854 | 854 | # loop determines if there are such revisions. |
| 855 | 855 | |
| 856 | 856 | upvar 1 $nv ntdbroot |
| 857 | 857 | set ntdbroot $root |
| 858 | + $root cutfromparentbranch | |
| 858 | 859 | |
| 859 | - set rev [$root child] | |
| 860 | + set rev $root | |
| 860 | 861 | while {$rev ne ""} { |
| 861 | 862 | $rev removeallbranches |
| 862 | 863 | # See note [x]. |
| 863 | 864 | |
| 864 | 865 | if {[$rev isondefaultbranch]} { |
| 865 | 866 | set rev [$rev child] |
| 866 | 867 | } else { |
| 867 | - set rev "" | |
| 868 | + break | |
| 868 | 869 | } |
| 869 | 870 | } |
| 870 | 871 | |
| 871 | 872 | # rev now contains the first non-NTDB revision after the |
| 872 | 873 | # NTDB, or is empty if there is no such. If we have some |
| 873 | 874 |
| --- tools/cvs2fossil/lib/c2f_file.tcl | |
| +++ tools/cvs2fossil/lib/c2f_file.tcl | |
| @@ -853,20 +853,21 @@ | |
| 853 | # truly on a branch and have to be excluded. The following |
| 854 | # loop determines if there are such revisions. |
| 855 | |
| 856 | upvar 1 $nv ntdbroot |
| 857 | set ntdbroot $root |
| 858 | |
| 859 | set rev [$root child] |
| 860 | while {$rev ne ""} { |
| 861 | $rev removeallbranches |
| 862 | # See note [x]. |
| 863 | |
| 864 | if {[$rev isondefaultbranch]} { |
| 865 | set rev [$rev child] |
| 866 | } else { |
| 867 | set rev "" |
| 868 | } |
| 869 | } |
| 870 | |
| 871 | # rev now contains the first non-NTDB revision after the |
| 872 | # NTDB, or is empty if there is no such. If we have some |
| 873 |
| --- tools/cvs2fossil/lib/c2f_file.tcl | |
| +++ tools/cvs2fossil/lib/c2f_file.tcl | |
| @@ -853,20 +853,21 @@ | |
| 853 | # truly on a branch and have to be excluded. The following |
| 854 | # loop determines if there are such revisions. |
| 855 | |
| 856 | upvar 1 $nv ntdbroot |
| 857 | set ntdbroot $root |
| 858 | $root cutfromparentbranch |
| 859 | |
| 860 | set rev $root |
| 861 | while {$rev ne ""} { |
| 862 | $rev removeallbranches |
| 863 | # See note [x]. |
| 864 | |
| 865 | if {[$rev isondefaultbranch]} { |
| 866 | set rev [$rev child] |
| 867 | } else { |
| 868 | break |
| 869 | } |
| 870 | } |
| 871 | |
| 872 | # rev now contains the first non-NTDB revision after the |
| 873 | # NTDB, or is empty if there is no such. If we have some |
| 874 |