Fossil SCM
Bugfix. Allow for removal of a path from a workspace which was not added to the workspace yet. Issue a warning when encontering this.
Commit
a25bafb76a56dd2d184212b7570eb923c5bb028a
Parent
300f31260bf7d0f…
1 file changed
+5
-1
| --- tools/cvs2fossil/lib/c2f_wsstate.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_wsstate.tcl | ||
| @@ -46,11 +46,15 @@ | ||
| 46 | 46 | |
| 47 | 47 | foreach {rid path label rop} $oprevisioninfo { |
| 48 | 48 | log write 5 wss {$myop($rop) $label} |
| 49 | 49 | |
| 50 | 50 | if {$rop < 0} { |
| 51 | - unset mystate($path) | |
| 51 | + if {[catch { | |
| 52 | + unset mystate($path) | |
| 53 | + }]} { | |
| 54 | + log write 0 wss "Removed path \"$path\" is not known to the workspace" | |
| 55 | + } | |
| 52 | 56 | } else { |
| 53 | 57 | set mystate($path) [list $rid $label] |
| 54 | 58 | } |
| 55 | 59 | } |
| 56 | 60 | return |
| 57 | 61 |
| --- tools/cvs2fossil/lib/c2f_wsstate.tcl | |
| +++ tools/cvs2fossil/lib/c2f_wsstate.tcl | |
| @@ -46,11 +46,15 @@ | |
| 46 | |
| 47 | foreach {rid path label rop} $oprevisioninfo { |
| 48 | log write 5 wss {$myop($rop) $label} |
| 49 | |
| 50 | if {$rop < 0} { |
| 51 | unset mystate($path) |
| 52 | } else { |
| 53 | set mystate($path) [list $rid $label] |
| 54 | } |
| 55 | } |
| 56 | return |
| 57 |
| --- tools/cvs2fossil/lib/c2f_wsstate.tcl | |
| +++ tools/cvs2fossil/lib/c2f_wsstate.tcl | |
| @@ -46,11 +46,15 @@ | |
| 46 | |
| 47 | foreach {rid path label rop} $oprevisioninfo { |
| 48 | log write 5 wss {$myop($rop) $label} |
| 49 | |
| 50 | if {$rop < 0} { |
| 51 | if {[catch { |
| 52 | unset mystate($path) |
| 53 | }]} { |
| 54 | log write 0 wss "Removed path \"$path\" is not known to the workspace" |
| 55 | } |
| 56 | } else { |
| 57 | set mystate($path) [list $rid $label] |
| 58 | } |
| 59 | } |
| 60 | return |
| 61 |