Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3A04F77EC for ; Sun, 7 Aug 2011 18:41:40 +0000 (UTC) Received: (qmail 92055 invoked by uid 500); 7 Aug 2011 18:41:39 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 91939 invoked by uid 500); 7 Aug 2011 18:41:38 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 91931 invoked by uid 99); 7 Aug 2011 18:41:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Aug 2011 18:41:38 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of jchris@gmail.com designates 74.125.82.54 as permitted sender) Received: from [74.125.82.54] (HELO mail-ww0-f54.google.com) (74.125.82.54) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Aug 2011 18:41:32 +0000 Received: by wwg9 with SMTP id 9so1836025wwg.23 for ; Sun, 07 Aug 2011 11:41:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=ZL5UO070zhjLbrLTwr48NH4OCNTcSzC05mmt0mOjUpU=; b=V4bwP9iAan3Fc9BxQB5mNDzXgYJM/iv/1SQUWIcAP4fjqF38636N7KvQNCLpqRcGr2 00BDIpR1BJf/urCTZFURY6JlhN5kCu1hX7a1SMMBaZGDOzVrrSVUe7O+H25yRSYwj/Si db9Qk4ys0HZKv6av3bslmJZNEGh4oFpVmMKmk= MIME-Version: 1.0 Received: by 10.227.55.142 with SMTP id u14mr3778433wbg.87.1312742471850; Sun, 07 Aug 2011 11:41:11 -0700 (PDT) Sender: jchris@gmail.com Received: by 10.227.175.70 with HTTP; Sun, 7 Aug 2011 11:41:11 -0700 (PDT) In-Reply-To: References: <8A3B62ED-A811-45FF-8A1D-904B8040BD61@dionne-associates.com> Date: Sun, 7 Aug 2011 11:41:11 -0700 X-Google-Sender-Auth: mmxJEONcc5U8EY_IRGkSzNFFFYg Message-ID: Subject: Re: Moving CouchDB to Git From: Chris Anderson To: dev@couchdb.apache.org Content-Type: text/plain; charset=ISO-8859-1 X-Virus-Checked: Checked by ClamAV on apache.org I agree we should do the srcmv thing after we move to git. No need to introduce more complexity to the git/svn question. Plus git is better at that sort of thing, in general, than svn, so waiting until we are git makes sense to me. Chris On Mon, Aug 1, 2011 at 1:37 PM, Robert Newson wrote: > +1 for doing the move afterwards. > > On 1 August 2011 21:34, Randall Leeds wrote: >> I think the big question Paul was trying to get an answer to was "srcmv >> before or after?". >> I'm not sure I have strong feelings, but I feel like we need to answer that >> or all these +1s aren't going to move us forward. >> >> On Mon, Aug 1, 2011 at 12:11, Robert Dionne wrote: >> >>> +1 >>> >>> >>> >>> >>> On Jul 31, 2011, at 12:29 PM, Paul Davis wrote: >>> >>> > Dearest Devs, >>> > >>> > A few months ago I did some work in preparing a solution to using Git >>> > as a primary VCS at the ASF. Now that we have released 1.1.0 and 1.0.3 >>> > there's a bit of a lull in large events dealing with the code base. As >>> > such I thought now would be a good time to propose the idea of moving >>> > CouchDB to Git. >>> > >>> > A few things on what this would mean for the community: >>> > >>> > 1. The SVN repository would no longer be the primary source for >>> > CouchDB source code. It'll still exist for house keeping things like >>> > the website and other bits. >>> > >>> > 2. For the time being there is no fancy integration with anything like >>> > Gerrit. The initial phase of moving to Git will be to just test the >>> > infrastructure aspects of the system to make sure its all configured >>> > correctly and works reliably. This also applies to GitHub. There's no >>> > magical "Pull request turns into JIRA ticket" or similar. GitHub will >>> > remain as it is a currently, a read-only mirror in the GitHub >>> > ecosystem. >>> > >>> > 3. There are a couple minor restrictions on our Git usage as required >>> > by ASF policy. First, rewriting Git commits on master is prohibited. I >>> > also added a feature that allows us to make branches that can't be >>> > rewritten either in the interest of protecting release branches. >>> > Currently, this is just a regular expression that matches >>> > "(master)|(rel/*)" in the branch name. The second issue is that >>> > there's always a possibility we have to revert to SVN if things break. >>> > In this interest I've disabled inserting merge commits into those same >>> > branches. >>> > >>> > 4. Before making the complete switch I'll end up making a handful of >>> > Git clones to check that our history is preserved. I plan on writing a >>> > script to make Graphviz images of the branch history and so on, but >>> > having people volunteer to look back at the history to spot errors >>> > would be helpful as well. >>> > >>> > 5. There are probably other things, but this is mostly to just kick >>> > off serious discussion on making the switch. >>> > >>> > Thoughts? >>> > >>> > Paul >>> >>> >> > -- Chris Anderson http://jchrisa.net http://couchbase.com