[svk-commit] r2488 - branches/2.0-releng/lib/SVK/Command

[nobody at bestpractical.com]

Author: clkao
Date: Tue Jul 17 11:35:20 2007
New Revision: 2488

Modified:
   branches/2.0-releng/lib/SVK/Command/Commit.pm

Log:
merge from trunk:
 r2394 at trunk:  clkao | 2007-05-11 12:30:45 +0100
 Work around a problem that push -P might be using the inspector whose root
 has been polluted due to pool usage.
 


Modified: branches/2.0-releng/lib/SVK/Command/Commit.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Command/Commit.pm	(original)
+++ branches/2.0-releng/lib/SVK/Command/Commit.pm	Tue Jul 17 11:35:20 2007
@@ -208,6 +208,9 @@
     my %cb = SVK::Editor::Merge->cb_for_root
 	($target->root, $target->path_anchor,
 	 $m ? $m->fromrev : $target->revision);
+    # XXX: the insepctor's root doesn't belong to it, so we have to
+    # hold the target for now.
+    $cb{__hold_target} = $target;
     return ($patch->commit_editor ($fname),
 	    %cb, send_fulltext => 0);
 }