Differences From:

File tools/cvs2fossil/lib/c2f_wsstate.tcl part of check-in [c9270189c2] - Added tracking of file removal in changesets. by aku on 2008-02-05 15:52:35. Also file tools/cvs2fossil/lib/c2f_wsstate.tcl part of check-in [6b78df3861] - Merge in changes from Andreas's branch. by drh on 2008-02-08 21:52:21. [view]

To:

File tools/cvs2fossil/lib/c2f_wsstate.tcl part of check-in [a25bafb76a] - Bugfix. Allow for removal of a path from a workspace which was not added to the workspace yet. Issue a warning when encontering this. by aku on 2008-02-14 04:27:42. [view]

@@ -47,9 +47,13 @@
 	foreach {rid path label rop} $oprevisioninfo {
 	    log write 5 wss {$myop($rop) $label}
 
 	    if {$rop < 0} {
-		unset mystate($path)
+		if {[catch {
+		    unset mystate($path)
+		}]} {
+		    log write 0 wss "Removed path \"$path\" is not known to the workspace"
+		}
 	    } else {
 		set mystate($path) [list $rid $label]
 	    }
 	}