[svk-commit] r2125 - trunk/lib/SVK/Command

mndrix at bestpractical.com mndrix at bestpractical.com
Tue Nov 7 10:46:42 EST 2006


Author: mndrix
Date: Tue Nov  7 10:46:40 2006
New Revision: 2125

Modified:
   trunk/lib/SVK/Command/Cmerge.pm

Log:
Eliminate some warnings in 09cmerge.t and 74chgspec.t (caused by the
SVK::Depot refactor?)

Modified: trunk/lib/SVK/Command/Cmerge.pm
==============================================================================
--- trunk/lib/SVK/Command/Cmerge.pm	(original)
+++ trunk/lib/SVK/Command/Cmerge.pm	Tue Nov  7 10:46:40 2006
@@ -77,7 +77,7 @@
     $ceditor->replay (SVN::Delta::Editor->new
 		      (_debug => 0,
 		       _editor => [ $repos->get_commit_editor
-				    ("file://$src->{repospath}",
+				    ('file://' . $src->depot->repospath,
 				     $tmpbranch,
 				     $ENV{USER}, "merge $self->{chgspec} from $src->{path}",
 				     sub { print loc("Committed revision %1.\n", $_[0]) })


More information about the svk-commit mailing list