From owner-svn-src-user@FreeBSD.ORG  Thu Sep 17 13:33:40 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B96F41065703;
	Thu, 17 Sep 2009 13:33:40 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A85EB8FC1C;
	Thu, 17 Sep 2009 13:33:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HDXepK058554;
	Thu, 17 Sep 2009 13:33:40 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8HDXeuD058552;
	Thu, 17 Sep 2009 13:33:40 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200909171333.n8HDXeuD058552@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 17 Sep 2009 13:33:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197279 - user/des/fmerge
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Sep 2009 13:33:40 -0000

Author: des
Date: Thu Sep 17 13:33:40 2009
New Revision: 197279
URL: http://svn.freebsd.org/changeset/base/197279

Log:
  Do a real svn --dry-run when $pretend.

Modified:
  user/des/fmerge/fmerge.pl

Modified: user/des/fmerge/fmerge.pl
==============================================================================
--- user/des/fmerge/fmerge.pl	Thu Sep 17 13:31:39 2009	(r197278)
+++ user/des/fmerge/fmerge.pl	Thu Sep 17 13:33:40 2009	(r197279)
@@ -69,8 +69,9 @@ sub svn_check($@) {
 
 sub svn_do(@) {
     my @argv = @_;
+    unshift(@argv, '--dry-run')
+	if $pretend;
     info('svn', @argv);
-    return if $pretend;
     my $pid = fork();
     if ($pid == -1) {
 	die("fork(): $!\n");