From owner-svn-ports-all@freebsd.org Mon Aug 15 10:01:59 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED317BBAD0F; Mon, 15 Aug 2016 10:01:59 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BDA69181E; Mon, 15 Aug 2016 10:01:59 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7FA1wKL084310; Mon, 15 Aug 2016 10:01:58 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7FA1wHH084309; Mon, 15 Aug 2016 10:01:58 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201608151001.u7FA1wHH084309@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 15 Aug 2016 10:01:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420223 - 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.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 10:02:00 -0000 Author: mat Date: Mon Aug 15 10:01:58 2016 New Revision: 420223 URL: https://svnweb.freebsd.org/changeset/ports/420223 Log: Echo where the merge was done, so one can go and have a look. Sponsored by: Absolight Modified: head/Tools/scripts/mfh Modified: head/Tools/scripts/mfh ============================================================================== --- head/Tools/scripts/mfh Mon Aug 15 09:39:32 2016 (r420222) +++ head/Tools/scripts/mfh Mon Aug 15 10:01:58 2016 (r420223) @@ -117,6 +117,7 @@ done "${svn}" up --quiet "${branch}" "${svn}" status "${branch}" "${svn}" diff "${branch}" +echo "All the merge work was done in ${dir}/${branch}." ask "Do you want to commit? (no = start a shell)" || ( echo "Dropping you to a shell so you can investigate. Exit the shell to resume this script." cd "${branch}"