From owner-freebsd-current@FreeBSD.ORG Mon Jul 2 21:56:02 2012 Return-Path: Delivered-To: current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 984711065675; Mon, 2 Jul 2012 21:56:02 +0000 (UTC) (envelope-from simon@FreeBSD.org) Received: from emx.nitro.dk (emx.nitro.dk [IPv6:2a01:4f8:120:7384::102]) by mx1.freebsd.org (Postfix) with ESMTP id 2DBC48FC19; Mon, 2 Jul 2012 21:56:02 +0000 (UTC) Received: from mailscan.leto.nitro.dk (mailscan.leto.nitro.dk [127.0.1.4]) by emx.nitro.dk (Postfix) with ESMTP id 5804A20E18E; Mon, 2 Jul 2012 21:56:01 +0000 (UTC) Received: from emx.nitro.dk ([127.0.1.2]) by mailscan.leto.nitro.dk (mailscan.leto.nitro.dk [127.0.1.4]) (amavisd-new, port 10024) with LMTP id SUaVsTtvEHZu; Mon, 2 Jul 2012 21:55:59 +0000 (UTC) Received: from [192.168.4.24] (unknown [89.100.2.68]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by emx.nitro.dk (Postfix) with ESMTPSA id 0364A20E18B; Mon, 2 Jul 2012 21:55:58 +0000 (UTC) Mime-Version: 1.0 (Apple Message framework v1278) Content-Type: text/plain; charset=us-ascii From: "Simon L. B. Nielsen" In-Reply-To: <20120702213955.GA96547@dragon.NUXI.org> Date: Mon, 2 Jul 2012 22:55:57 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: <25EA13B6-10A2-404C-8DDA-8C1DD39B13DB@FreeBSD.org> References: <2A1FD996-9AB7-4F8D-B22D-0B3F0437C0F2@FreeBSD.org> <20120702213955.GA96547@dragon.NUXI.org> To: obrien@FreeBSD.org X-Mailer: Apple Mail (2.1278) Cc: current@FreeBSD.org Subject: Re: SVN2CVS exporter down X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jul 2012 21:56:02 -0000 On 2 Jul 2012, at 22:39, David O'Brien wrote: > On Sun, Jul 01, 2012 at 11:14:45AM +0100, Simon L. B. Nielsen wrote: >> On 1 Jul 2012, at 10:20, Bjoern A. Zeeb wrote: >>> Just FYI, >>>=20 >>> the svn2cvs exporter is currently down due to >>> http://svn.freebsd.org/changeset/base/237860 . >>> I'll fix it as soon as I get back from lunch, so should be back in a >>> few hours. >>=20 >> Fixed. Please try not to replace files or even worse directories. = Thanks. >=20 > Simon, > Are you saying we are now restricted in the svn operations we can = perform > due to the lack of the svn2cvs exporter to consume them? Basically yes, though it's not a new thing - we have been from day 1 of = using svn. Or rather, each time somebody "replaces" a file we (peter, = bz, or me) have to manually hack svn2cvs to handle the case with the = increasing risk that we will do it wrong and svn/cvs will be out of = sync. > If so, this doesn't seem desirable... we moved to Subversion to obtain > such operations as file and directory moves. You can move files and dirs, just as long as you don't move them on top = of existing files. The problem is that that creates an 'remove' and = 'add' operation in the same changeset which CVS cannot handle. Tested patches are accepted = (http://svnweb.freebsd.org/base/svnadmin/tools/export.py), or even = better - work on killing off CVS sooner rather than later. > I suspect such operations will only happen with increased frequency = after > the Ports Collection moves to Subversion. Ports will explicitly deny "Replaced" files in a presubmit check. I will = look at adding the same for src once I get a chance. --=20 Simon L. B. Nielsen