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

[nobody at bestpractical.com]

Author: ruz
Date: Wed Jul  2 17:47:58 2008
New Revision: 2952

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

Log:
* don't write log if it's check only run, even if -l provided

Modified: trunk/lib/SVK/Command/Merge.pm
==============================================================================
--- trunk/lib/SVK/Command/Merge.pm	(original)
+++ trunk/lib/SVK/Command/Merge.pm	Wed Jul  2 17:47:58 2008
@@ -244,7 +244,7 @@
 	delete $self->{save_message};
     }
 
-    if ( $self->{log} && $dst->isa('SVK::Path::Checkout') ) {
+    if ( $self->{log} && !$self->{check_only} && $dst->isa('SVK::Path::Checkout') ) {
         my ($fh, $file) = tmpfile ('commit', DIR => '', TEXT => 1, UNLINK => 0);
         print $fh $merge->log(1);
         $logger->warn(loc ("Log message saved in %1.", $file));