Date: Wed, 12 Dec 2012 20:55:30 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244161 - in projects/portbuild: conf scripts Message-ID: <201212122055.qBCKtUaE045733@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212122055.qBCKtUaE045733>