[svk-commit] r3153 - trunk/lib/SVK

[nobody at bestpractical.com]

Author: clkao
Date: Mon Dec 21 10:59:28 2009
New Revision: 3153

Modified:
   trunk/lib/SVK/XD.pm

Log:
Do not try to delete entries inside a non-copy replace.

Modified: trunk/lib/SVK/XD.pm
==============================================================================
--- trunk/lib/SVK/XD.pm	(original)
+++ trunk/lib/SVK/XD.pm	Mon Dec 21 10:59:28 2009
@@ -1204,7 +1204,8 @@
     my $schedule = $arg{cinfo}{'.schedule'} || '';
 
     if ($schedule eq 'delete' || $schedule eq 'replace') {
-	my $should_do_delete = !$arg{_really_in_copy} || $arg{copath} eq ($arg{cinfo}{scheduleanchor} || '');
+	my $should_do_delete = (!$arg{_really_in_copy} && !$arg{base})
+            || $arg{copath} eq ($arg{cinfo}{scheduleanchor} || '');
 	$self->_node_deleted (%arg)
 	    if $should_do_delete;
 	# when doing add over deleted entry, descend into it