Patching locally against mirror source http://code.bestpractical.com/svk.
==== Patch <-> level 1
Source: [No source]
Target: 4ccb8a5b-8ae0-0310-9b02-86531366991d:/trunk:2525
        (http://code.bestpractical.com/svk)
Log:
Fix TODO test: pull from non-mirror source
=== lib/SVK/Command/Pull.pm
==================================================================
--- lib/SVK/Command/Pull.pm	(revision 2525)
+++ lib/SVK/Command/Pull.pm	(patch - level 1)
@@ -93,7 +93,7 @@
     }
 
 
-    $self->{sync}++ unless $self->{'no_sync'};
+    $self->{sync} = 'maybe' unless $self->{'no_sync'};
     $self->{merge}++;
 
     $self->SUPER::parse_arg (@arg);
=== lib/SVK/Command/Update.pm
==================================================================
--- lib/SVK/Command/Update.pm	(revision 2525)
+++ lib/SVK/Command/Update.pm	(patch - level 1)
@@ -112,7 +112,7 @@
         # Because merging under the copy anchor is unsafe, we always merge
         # to the most immediate copy anchor under copath root.
         my ($merge_target, $copied_from) = $self->find_checkout_anchor (
-            $target, $self->{merge}, $self->{sync}
+            $target, $self->{merge}, $self->{sync} && $self->{sync} ne 'maybe'
         );
 
         my $sync_target = $copied_from || $merge_target;
@@ -132,7 +132,7 @@
                     %$self, sync => 0,
                 }
             )->run (
-                $merge_target->copied_from($self->{sync}) => $merge_target
+                $merge_target->copied_from($self->{sync} && $self->{sync} ne 'maybe') => $merge_target
             );
         }
 	$update_target->refresh_revision if $self->{sync} || $self->{merge};
=== t/36push-pull-local.t
==================================================================
--- t/36push-pull-local.t	(revision 2525)
+++ t/36push-pull-local.t	(patch - level 1)
@@ -20,16 +20,11 @@
 append_file("$corpath_trunk/me", "another line in trunk");
 $svk->commit(-m => 'modify on trunk', $corpath_trunk);
 
-TODO: {
-    local $TODO = 'entirely local pull should actually pull';
-    # these regexps might not actually be right. The point is it should do SOMETHING with the me file::path
-    is_output($svk, 'pull', [__($corpath_branch)],
-              ['Auto-merging (3, 5) /trunk to /branch (base /trunk:3).',
-               'U   me',
-               qr'New merge ticket: .*:/trunk:5',
-               'Committed revision 6.',
-               "Syncing //branch(/branch) in $corpath_branch to 6.",
-               __("U   $corpath_branch/me"),]);
-}
+is_output($svk, 'pull', [__($corpath_branch)],
+          ['Auto-merging (3, 5) /trunk to /branch (base /trunk:3).',
+           'U   me',
+           qr'New merge ticket: .*:/trunk:5',
+           'Committed revision 6.',
+           "Syncing //branch(/branch) in ".__($corpath_branch)." to 6.",
+           __("U   $corpath_branch/me"),]);
 
-

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

eJyFlVuL20YUx/VWMJTmIwxGie1i2ZqrRg41Lk33pZAL2S2BkJjRaLQrVrdK402WqlBCSks/Qgj4
pR+l/V6dke1l7bq7fpCR5pz/+Z3LzJzUp48XsJ3P/daFfvvyxx9ms+dCy4uH5s1lrYpTXdYubTN1
pTIXt1l57pK2ELkyq1rU50rP59A4843z953DToRYjUjosmjcsBNb6lopF7Z8EbYL1C6wcW2hWSwr
VSzrstQmGCKUUbO6tEwyKxu1tL7GeEGtPXIh2TjEaa2kCXht0dKo09r5d6bBEVPY6j1DbAPRbaDb
ZtASdjL4iExgI05N1h3RvWLoRowcY6I7tel3ZZ6LIu6i3quKb4pCd0VM0ky5CB/qTZ+vsmxS5R3A
Xo3Yvud/SKZnVSy0OvT9XyayybRbFVWVXS+1eq9jlWnRcWLUxkGSRAEKcBJDDiVSiPsoVlxBlUBK
hIuhmaenjrNm63mv53wqnD+djyefKvANGOTiOlKDBbk9Hx36Vhz7UEaURCRUMkRRGJGAw0SaAMSX
ELE78ZhV8IMkgAHhPuGxIoYxJpFkTHJOpeJJ4nK8wfv71T8PHnBn/db57Pz25frtZ2ed/3UJHj0C
bqOyxJv/3FwX8hdQqB32XWtHU+qATLlwIsMAUj9ULEEoShRHlELpUyFFeDNbfL+XZtSnmFWr5sKr
TPu9rJQim+huY9zbx+DOQnHLRVksRRwhIpIwEjBEkMWUIIrCAOEEGnbKNpX649XvX33x4YXzce78
+uFF2izLla5Weug2V5djMLB0gzF4vVwOXVnWldAXy6gWhbwYvRn3wM3v9eDblS69XNXnaXEOhngM
6AhMdb0qLoEuwXTjBIaRaNT2+wyPJoPbImBwZh652v/4Uz14qt4BK62ATuWl0jMw+Xq2FaEHEnZz
pFqrGNTqKm3SsgDsIEz/pWmwxZxusYbb/xFIC9CfHEl20rdZsEl/T8gY9i3ygfU0V/3R+M3oca93
dHS6FoVYxaYtYRSRmCGU0ERihkJpdlvAGGfdUUhQe5K+B6fPnjwDWjUmcdsQkNRlDoqy8PK0rssa
NOWqllbZm89R6yK0OfRPu3tgNjsr0itVNyJ7yFpzS1hScy6b8piX1SqNzWWwKaZ5NzNiNitriZQR
FzTyuFC+52Poe2HkI48ziiFmLAxh/C/2HBAw
==== END SVK PATCH BLOCK ====