From owner-svn-ports-all@FreeBSD.ORG  Thu Dec 26 17:27:20 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3DBD2C03;
 Thu, 26 Dec 2013 17:27:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A051125B;
 Thu, 26 Dec 2013 17:27:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQHRKUE090881;
 Thu, 26 Dec 2013 17:27:20 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQHRKsM090880;
 Thu, 26 Dec 2013 17:27:20 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312261727.rBQHRKsM090880@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 26 Dec 2013 17:27:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337564 - head/Tools/scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Dec 2013 17:27:20 -0000

Author: bapt
Date: Thu Dec 26 17:27:19 2013
New Revision: 337564
URL: http://svnweb.freebsd.org/changeset/ports/337564

Log:
  update the tree before merge to avoid having a mixed revision tree before merging

Modified:
  head/Tools/scripts/mfh

Modified: head/Tools/scripts/mfh
==============================================================================
--- head/Tools/scripts/mfh	Thu Dec 26 17:22:28 2013	(r337563)
+++ head/Tools/scripts/mfh	Thu Dec 26 17:27:19 2013	(r337564)
@@ -77,6 +77,7 @@ svn log -r$rev svn://svn.freebsd.org/por
 for f in ${filelist}; do
 	svn up --parents ${branch}/${f}
 done
+svn up --quiet ${branch}
 svn merge -c r${rev} ^/head/ ${branch}
 svn up --quiet ${branch}
 svn diff ${branch}