Differences From:

File tools/cvs2fossil/lib/c2f_file.tcl part of check-in [a766b08198] - Reworked object deletion to happen centrally after the file has been processed (drop). Simplified the code restructuring the revision tree as it now doesn't have to think about when and where to remove objects. by aku on 2007-10-23 03:29:36. [view]

To:

File tools/cvs2fossil/lib/c2f_file.tcl part of check-in [e94b52b6f2] - Restructured the code handling NTBD in ExcludeBranch a bit to prevent the asserts in GraftNTDB2Trunk to bail out. by aku on 2007-10-23 04:36:31. [view]

@@ -854,18 +854,19 @@
 	    # loop determines if there are such revisions.
 
 	    upvar 1 $nv ntdbroot
 	    set ntdbroot $root
-
-	    set rev [$root child]
+	    $root cutfromparentbranch
+
+	    set rev $root
 	    while {$rev ne ""} {
 		$rev removeallbranches
 		# See note [x].
 
 		if {[$rev isondefaultbranch]} {
 		    set rev [$rev child]
 		} else {
-		    set rev ""
+		    break
 		}
 	    }
 
 	    # rev now contains the first non-NTDB revision after the