From owner-svn-src-projects@FreeBSD.ORG  Wed Dec 12 20:55:31 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B27A2567;
 Wed, 12 Dec 2012 20:55:31 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7E9718FC12;
 Wed, 12 Dec 2012 20:55:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCKtV5m045737;
 Wed, 12 Dec 2012 20:55:31 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCKtUaE045733;
 Wed, 12 Dec 2012 20:55:30 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212122055.qBCKtUaE045733@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 12 Dec 2012 20:55:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244161 - in projects/portbuild: conf scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 20:55:31 -0000

Author: linimon (doc,ports committer)
Date: Wed Dec 12 20:55:30 2012
New Revision: 244161
URL: http://svnweb.freebsd.org/changeset/base/244161

Log:
  Set default policies for dealing with SVN conflicts.  For background
  updates, smash any local changes.  For makeworld or build commands
  that do not specify -novcs, keep local changes and for later resolution.
  The latter is not yet tested.
  
  Suggested by:	beat

Modified:
  projects/portbuild/conf/server.conf
  projects/portbuild/scripts/updatesnap
  projects/portbuild/scripts/updatesnap.ports

Modified: projects/portbuild/conf/server.conf
==============================================================================
--- projects/portbuild/conf/server.conf	Wed Dec 12 19:45:36 2012	(r244160)
+++ projects/portbuild/conf/server.conf	Wed Dec 12 20:55:30 2012	(r244161)
@@ -115,7 +115,8 @@ MASTER_URL="pointyhat.freebsd.org"
 
 VCS="SVN"
 VCS_CHECKOUT_COMMAND="svn checkout"
-VCS_UPDATE_COMMAND="svn update"
+VCS_OVERWRITE_COMMAND="svn update --accept theirs-full"
+VCS_UPDATE_COMMAND="svn update --accept postpone"
 
 # this subdirectory is used as a flag to say "checkout has already happened,
 # use update instead"

Modified: projects/portbuild/scripts/updatesnap
==============================================================================
--- projects/portbuild/scripts/updatesnap	Wed Dec 12 19:45:36 2012	(r244160)
+++ projects/portbuild/scripts/updatesnap	Wed Dec 12 20:55:30 2012	(r244161)
@@ -89,9 +89,9 @@ for branch in $SRC_BRANCHES; do
       ${VCS_CHECKOUT_COMMAND} ${VCS_SRC_REPOSITORY}/${subdir} ${mountpoint}/src || finish 1
     else
       if [ $VERBOSE ]; then
-        echo "${VCS_UPDATE_COMMAND} ${mountpoint}/src"
+        echo "${VCS_OVERWRITE_COMMAND} ${mountpoint}/src"
       fi
-      ${VCS_UPDATE_COMMAND} ${mountpoint}/src || finish 1
+      ${VCS_OVERWRITE_COMMAND} ${mountpoint}/src || finish 1
     fi
     echo ${fulldate} > src/.updated
     # hack for zfs breakiness

Modified: projects/portbuild/scripts/updatesnap.ports
==============================================================================
--- projects/portbuild/scripts/updatesnap.ports	Wed Dec 12 19:45:36 2012	(r244160)
+++ projects/portbuild/scripts/updatesnap.ports	Wed Dec 12 20:55:30 2012	(r244161)
@@ -81,9 +81,9 @@ if [ ! -d ${head}/ports/${VCS_SUBDIR} ];
   ${VCS_CHECKOUT_COMMAND} ${VCS_PORTS_REPOSITORY}/head ${head}/ports || finish 1
 else
   if [ $VERBOSE ]; then
-    echo "${VCS_UPDATE_COMMAND} ${head}/ports"
+    echo "${VCS_OVERWRITE_COMMAND} ${head}/ports"
   fi
-  ${VCS_UPDATE_COMMAND} ${head}/ports || finish 1
+  ${VCS_OVERWRITE_COMMAND} ${head}/ports || finish 1
 fi
 echo ${fulldate} > ports/.updated
 # hack for zfs breakiness