[Bps-public-commit] r15817 - in Data-Hierarchy/trunk: .

[clkao at bestpractical.com]

Author: clkao
Date: Mon Sep  8 07:07:56 2008
New Revision: 15817

Modified:
   Data-Hierarchy/trunk/   (props changed)
   Data-Hierarchy/trunk/lib/Data/Hierarchy.pm

Log:
 r35458 at mtl (orig r393):  glasser | 2006-11-06 02:47:43 +0800
 Fix 'svk revert' crash in some cases.
 
 * lib/Data/Hierarchy.pm
   (merge): Handle the case of merging from an non-existent subtree.


Modified: Data-Hierarchy/trunk/lib/Data/Hierarchy.pm
==============================================================================
--- Data-Hierarchy/trunk/lib/Data/Hierarchy.pm	(original)
+++ Data-Hierarchy/trunk/lib/Data/Hierarchy.pm	Mon Sep  8 07:07:56 2008
@@ -384,7 +384,9 @@
 
     $self->_path_safe($path);
 
-    my $node = dclone($other->_get_subtree($path));
+    my $node = $other->_get_subtree($path);
+
+    $node = defined $node ? dclone($node) : Data::Hierarchy::Node->new;
 
     # We need to make sure that things that are inherited onto $path
     # in the other tree end up on $path in our tree.