Differences From:

File tools/cvs2fossil/lib/c2f_file.tcl part of check-in [886b6f257b] - Added code able to exclude all non-trunk revisions upon user request. by aku on 2007-10-21 06:10:13. [view]

To:

File tools/cvs2fossil/lib/c2f_file.tcl part of check-in [436f17a5f0] - Simplified the code for excluding non-trunk revisions a bit, using higher-level methods for some changes. Added missing revision destruction. by aku on 2007-10-21 07:08:28. [view]

@@ -663,8 +663,9 @@
 	    $first retype add
 
 	    # Move any tags and branches from the old to the new root.
 	    $rev11 movesymbolsto $first
+	    $rev11 destroy
 	}
 
 	# Mark all the special revisions as such
 	foreach rev $revlist {
@@ -942,15 +943,10 @@
 	    set rev12 [$last defaultbranchchild]
 	    $rev12 cutdefaultbranchparent
 	    $last  cutdefaultbranchchild
 
-	    # TODO :: Combine into one method 'changeparent', or
-	    # 'moveparent', etc.
-	    $rev12 cutfromparent
-	    $rev12 setparent $last
-
-	    $last cutfromchild
-	    $last setchild $rev12
+	    $rev12 changeparent $last
+	    $last  changechild $rev12
 
 	    ldelete myroots $rev12
 
 	    # Note and remember that the type of rev12 was already