Date: Thu, 17 Oct 2013 14:05:19 -0700 (PDT) From: Jeffrey Bouquet <jeffreybouquet@yahoo.com> To: ports list <freebsd-ports@freebsd.org> Subject: Svn wrapper? [pasted from a Q. on the forum] ... To resolve "conflicts remaining" Message-ID: <1382043919.84992.YahooMailNeo@web163906.mail.gq1.yahoo.com>
next in thread | raw e-mail | index | archive | help
On many machines here, the ports or src tree upon svn up shows a large nu= mber of conflicts, half of which want an =0Aanswer such as "postpone", the = other "theirs-full". Re-downloading with svn seems to not resolve the confl= icts. (Why they =0Aappear in the first place, nothing changed on this machi= ne in the meantime, is a complete mystery.) The often recommended delete-an= d-re-checkout procedure is okay, but takes much more time (preserving extra= files etc) than I"d like to, if there was any svn command that mimics the = old =0Acvs procedure of remove-directory and re-=0Acvs it. Anyone =0Aknows = of a succinct svn command for use in such situations, or if a wrapper could= be crafted that puts forth the series of =0Acommands that would take less = time than a new src or ports checkout? The handbook refers to the SVN redbo= ok, it might have the answer, but I am reluctant to spend the time reading = it thoroughly if someone else has and knows the answer(s) already.=0A=0A=0A= Thanks.=A0=0AJ. Bouquet=A0=0A[The forum thread has a few posts in it with a= few more details ]... From owner-freebsd-ports@FreeBSD.ORG Thu Oct 17 22:35:52 2013 Return-Path: <owner-freebsd-ports@FreeBSD.ORG> Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2AF08981 for <freebsd-ports@freebsd.org>; Thu, 17 Oct 2013 22:35:52 +0000 (UTC) (envelope-from cswiger@mac.com) Received: from st11p05mm-asmtp003.mac.com (st11p05mm-asmtp003.mac.com [17.172.108.248]) by mx1.freebsd.org (Postfix) with ESMTP id 010EF280E for <freebsd-ports@freebsd.org>; Thu, 17 Oct 2013 22:35:51 +0000 (UTC) Received: from [17.198.13.205] (unknown [17.198.13.205]) by st11p05mm-asmtp003.mac.com (Oracle Communications Messaging Server 7u4-27.08(7.0.4.27.7) 64bit (built Aug 22 2013)) with ESMTPSA id <0MUU00JQO1B6B590@st11p05mm-asmtp003.mac.com> for freebsd-ports@freebsd.org; Thu, 17 Oct 2013 21:35:33 +0000 (GMT) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.10.8794,1.0.431,0.0.0000 definitions=2013-10-17_06:2013-10-17,2013-10-17,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1308280000 definitions=main-1310170098 Content-type: text/plain; charset=iso-8859-1 MIME-version: 1.0 (Mac OS X Mail 6.6 \(1510\)) Subject: Re: Svn wrapper? [pasted from a Q. on the forum] ... To resolve "conflicts remaining" From: Charles Swiger <cswiger@mac.com> In-reply-to: <1382043919.84992.YahooMailNeo@web163906.mail.gq1.yahoo.com> Date: Thu, 17 Oct 2013 14:35:30 -0700 Content-transfer-encoding: quoted-printable Message-id: <863E6E90-511C-47F6-86D0-22CBA21FC5FC@mac.com> References: <1382043919.84992.YahooMailNeo@web163906.mail.gq1.yahoo.com> To: Jeffrey Bouquet <jeffreybouquet@yahoo.com> X-Mailer: Apple Mail (2.1510) Cc: ports list <freebsd-ports@freebsd.org> X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports>, <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>; List-Post: <mailto:freebsd-ports@freebsd.org> List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>, <mailto:freebsd-ports-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 17 Oct 2013 22:35:52 -0000 Hi-- On Oct 17, 2013, at 2:05 PM, Jeffrey Bouquet <jeffreybouquet@yahoo.com> = wrote: [ ... ] > Anyone knows of a succinct svn command for use in such situations, or = if a wrapper > could be crafted that puts forth the series of commands that would = take less > time than a new src or ports checkout? Have you tried "svn revert -R /usr/ports" or similar? % svn co svn://svn.freebsd.org/base/stable/9 FreeBSD-9 A FreeBSD-9/share A FreeBSD-9/share/skel A FreeBSD-9/share/skel/dot.cshrc A FreeBSD-9/share/skel/dot.rhosts A FreeBSD-9/share/skel/dot.mail_aliases A FreeBSD-9/share/skel/dot.mailrc [ ... ] % echo 'this is a local change' >> FreeBSD-9/share/skel/dot.cshrc % svn status FreeBSD-9/share/skel/dot.cshrc M FreeBSD-9/share/skel/dot.cshrc % svn revert -R FreeBSD-9 Reverted 'FreeBSD-9/share/skel/dot.cshrc' % svn status FreeBSD-9/share/skel/dot.cshrc % Regards, --=20 -Chuck
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1382043919.84992.YahooMailNeo>