[svk-commit] r2331 - branches/2.0-releng/lib/SVK/Editor

[nobody at bestpractical.com]

Author: clkao
Date: Wed Mar 14 20:03:07 2007
New Revision: 2331

Modified:
   branches/2.0-releng/lib/SVK/Editor/Diff.pm

Log:
Merge from trunk:
 r2291 at trunk:  mndrix | 2007-01-13 06:43:51 +0000
 Fix a regression introduced in r1541 which caused binary files to sometimes be
 displayed as text during an "svk diff".  Unfortunately, I wasn't able to
 create a failing .t


Modified: branches/2.0-releng/lib/SVK/Editor/Diff.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Editor/Diff.pm	(original)
+++ branches/2.0-releng/lib/SVK/Editor/Diff.pm	Wed Mar 14 20:03:07 2007
@@ -164,8 +164,8 @@
     $basepath = $self->{base_target}->path_anchor."/$path"
 	if $basepath !~ m{^/};
 
-    return $root->check_path($path, $pool) == $SVN::Node::none ?
-	undef : $root->node_prop($path, $prop, $pool);
+    return $root->check_path($basepath, $pool) == $SVN::Node::none ?
+	undef : $root->node_prop($basepath, $prop, $pool);
 }
 
 sub apply_textdelta {