Differences From:

File tools/cvs2fossil/lib/c2f_pcollar.tcl part of check-in [10f9d51bb2] - Added documentation to state definition, and debugging output to the state system itself. by aku on 2007-10-06 03:55:06. [view]

To:

File tools/cvs2fossil/lib/c2f_pcollar.tcl part of check-in [70b0aa899a] - Found easier way to access the typevariables of singletons when writing the rcs parser. Now moved the other singletons to the same construction. by aku on 2007-10-06 22:13:25. [view]

@@ -164,8 +164,10 @@
 	return $f
     }
 
     proc IsSuperceded {base rcs usr isattic} {
+	::variable myignore
+
 	if {!$isattic}                   {return 0}
 	if {![file exists $base/$usr,v]} {return 0}
 
 	# We have a regular archive and an Attic archive refering to
@@ -175,9 +177,8 @@
 	# has completed. The user can however force us to ignore it.
 	# In that case the warning is still printed, but will not
 	# induce an abort any longer.
 
-	upvar 1 myignore myignore
 	if {$myignore} {
 	    log write 2 collar "Ignored $rcs, superceded archive"
 	} else {
 	    trouble warn       "Ignored $rcs, superceded archive"