Date: Thu, 26 Dec 2013 17:27:19 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337564 - head/Tools/scripts Message-ID: <201312261727.rBQHRKsM090880@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312261727.rBQHRKsM090880>