[svk-commit] r3111 - branches/delta-refactor/lib/SVK

[nobody at bestpractical.com]

Author: clkao
Date: Thu Oct 30 05:41:01 2008
New Revision: 3111

Modified:
   branches/delta-refactor/lib/SVK/Delta.pm
   branches/delta-refactor/lib/SVK/XD.pm

Log:
make all tests pass.


Modified: branches/delta-refactor/lib/SVK/Delta.pm
==============================================================================
--- branches/delta-refactor/lib/SVK/Delta.pm	(original)
+++ branches/delta-refactor/lib/SVK/Delta.pm	Thu Oct 30 05:41:01 2008
@@ -211,7 +211,7 @@
     # don't use depth when we are still traversing through targets
     my $descend = defined $targets || !(defined $arg{depth} && $arg{depth} == 0);
     # XXX: the top level entry is undefined, which should be fixed.
-    $self->cb_conflict->($editor, defined $arg{entry} ? $arg{entry} : '', $arg{baton})
+    $self->cb_conflict->($editor, defined $arg{entry} ? $arg{entry} : '', $arg{baton}, $cinfo->{'.conflict'})
 	if $thisdir && $self->cb_conflict && $cinfo->{'.conflict'};
 
     # XXX: later
@@ -354,7 +354,7 @@
 	    }
 	}
 	if ($ccinfo->{'.conflict'}) {
-	    $self->cb_conflict->($editor, $newpaths{entry}, $arg{baton})
+	    $self->cb_conflict->($editor, $newpaths{entry}, $arg{baton}, $ccinfo->{'.conflict'})
 		if $self->cb_conflict;
 	}
 	unless ($add || $ccinfo->{'.conflict'}) {

Modified: branches/delta-refactor/lib/SVK/XD.pm
==============================================================================
--- branches/delta-refactor/lib/SVK/XD.pm	(original)
+++ branches/delta-refactor/lib/SVK/XD.pm	Thu Oct 30 05:41:01 2008
@@ -1274,7 +1274,8 @@
     my $schedule = $entry->{'.schedule'} || '';
 
     if (my ($source_path, $source_root) = $self->_copy_source ($entry, $copath, $root)) {
-	$props = $source_root->node_proplist ($source_path);
+        # the node we are checking might be a new node under somewhere copied, so we need to check the path again.
+	$props = $source_root->check_path($source_path) ? $source_root->node_proplist($source_path) : {};
     }
     elsif ($schedule ne 'add' && $schedule ne 'replace') {
 	Carp::cluck 'hate' unless defined $path;