Patching locally against mirror source http://code.bestpractical.com/svk.
==== Patch <-> level 1
Source: [No source]
Target: 4ccb8a5b-8ae0-0310-9b02-86531366991d:/trunk/lib/SVK/Editor:2474
        (http://code.bestpractical.com/svk)
Log:
Don't leak horribly when merging deletes
=== Merge.pm
==================================================================
--- Merge.pm	(revision 2474)
+++ Merge.pm	(patch - level 1)
@@ -740,6 +740,7 @@
 # Note that empty hash means don't delete - conflict.
 sub _check_delete_conflict {
     my ($self, $path, $rpath, $kind, $pdir, $pool) = @_;
+    $pool->default;
 
     my $localkind = $self->inspector->exist ($path, $pool);
 
@@ -760,8 +761,8 @@
 
     # it's dir...
 
-    my $dirmodified = $self->inspector->dirdelta ($path, $self->{base_root}, $rpath);
-    my $entries = $self->{base_root}->dir_entries ($rpath);
+    my $dirmodified = $self->inspector->dirdelta ($path, $self->{base_root}, $rpath, $pool);
+    my $entries = $self->{base_root}->dir_entries ($rpath, $pool);
 
     my $baton = $self->{storage_baton}{$path} = $self->{storage}->open_directory (
         $path, $self->{storage_baton}{$pdir}, $self->{cb_rev}->($path), $pool
@@ -777,13 +778,13 @@
                 $torm->{$name} = undef;
 	    }
             else {
-                $torm->{$name} = $self->_check_delete_conflict ($cpath, $crpath, $entry->kind, $path, $pool);
+                $torm->{$name} = $self->_check_delete_conflict ($cpath, $crpath, $entry->kind, $path, SVN::Pool->new($pool));
             }
             delete $dirmodified->{$name};
 	}
 	else { # dir or unmodified file
             $torm->{$name} = $self->_check_delete_conflict
-                ($cpath, $crpath, $entry->kind, $path, $pool);
+                ($cpath, $crpath, $entry->kind, $path, SVN::Pool->new($pool));
 	}
     }
 
@@ -791,7 +792,7 @@
         local $self->{tree_conflict} = 1;
         my ($cpath, $crpath) = ("$path/$node", "$rpath/$node");
         my $kind = $self->{base_root}->check_path ($crpath);
-        $torm->{$node} = $self->_check_delete_conflict ($cpath, $crpath, $kind, $path, $pool);
+        $torm->{$node} = $self->_check_delete_conflict ($cpath, $crpath, $kind, $path, SVN::Pool->new($pool));
     }
 
     $self->{storage}->close_directory ($baton, $pool);

==== BEGIN SVK PATCH BLOCK ====
Version: svk v2.0.99_01 (linux)

eJyNUs2K1EAQjlf16M1LwF7cBeMk3fmdxTCHXQVF2cXVa+gkNTthe9Kh0zPrYAtGxAcQ5kEWLx5E
fCd9ACvJDHg0hyaV7ydVX9dTdXE880yauoZ4rnn99sV0esZ1sTjAioQGykpLRQIjYA2CMCPkJfFN
zZeAqObqEnSaeiiOR/HpINib+L1HzrWsW5IMZplWAMQzdMbMjBo8sfAQlA3UmZJS48+ozyIP0azv
qRCyhazX9vyg59M9f14JILF5CdjH42Y5WO3lrJcHO3lZKSiwsU1PGX0GlDeN2GQa3ukShOaDN6Mm
AVry2IcyKGiQuDx3vYJHbsSCnAbzghM6hPXKsrrf592fB0fdfau7eWZ9tb7c6W5OPz63Pjvd97tb
qzvvfqRb61PU/by3tb7d6n6d2fiQRkrhpCXM+UroR2N9dHy7x5Ybm0CtVQWt/cQmLYi5k77POU7R
x/MBZZXK9oxDohquFzsLbAmjH7xruD4cbf//48z/N/Ih3F0gOHPguXEQRcmcsyjGhIHhe5iENAmL
eEjed82JrB9qWwC/shdSqSoXG/t6AbW9xCuq6ksbYwYNLfKdNKWGUDruzcWwStPpm7pag2q5OAgN
Llo/G26dgjUWq1VVYvJmotWqvpqIKp+gdjKuHOLUj3zCQuMXRR7zIHdiDq7jMs91ktylThwGzGNh
mCRe+ReWpvc3
==== END SVK PATCH BLOCK ====
