From dev-return-17379-apmail-couchdb-dev-archive=couchdb.apache.org@couchdb.apache.org Mon Aug 8 12:54:30 2011 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 4F23F8F37 for ; Mon, 8 Aug 2011 12:54:30 +0000 (UTC) Received: (qmail 61259 invoked by uid 500); 8 Aug 2011 12:54:29 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 61176 invoked by uid 500); 8 Aug 2011 12:54:28 -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 61167 invoked by uid 99); 8 Aug 2011 12:54:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Aug 2011 12:54:27 +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 adam.kocoloski@gmail.com designates 209.85.160.180 as permitted sender) Received: from [209.85.160.180] (HELO mail-gy0-f180.google.com) (209.85.160.180) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Aug 2011 12:54:21 +0000 Received: by gyc15 with SMTP id 15so1228364gyc.11 for ; Mon, 08 Aug 2011 05:54:00 -0700 (PDT) Received: by 10.101.145.19 with SMTP id x19mr4470647ann.152.1312808039237; Mon, 08 Aug 2011 05:53:59 -0700 (PDT) Received: from [192.168.1.7] (c-98-229-198-130.hsd1.ma.comcast.net [98.229.198.130]) by mx.google.com with ESMTPS id y8sm4818474ang.38.2011.08.08.05.53.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 08 Aug 2011 05:53:57 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Apple Message framework v1084) Subject: Re: Moving CouchDB to Git From: Adam Kocoloski In-Reply-To: Date: Mon, 8 Aug 2011 08:53:54 -0400 Content-Transfer-Encoding: quoted-printable Message-Id: <1B5C4198-B58D-4A29-B62D-519C842B707C@apache.org> References: <8A3B62ED-A811-45FF-8A1D-904B8040BD61@dionne-associates.com> To: dev@couchdb.apache.org X-Mailer: Apple Mail (2.1084) X-Virus-Checked: Checked by ClamAV on apache.org All good points, I think the counterargument is that it becomes rather = difficult to rollback to svn after we do something as complicated as = srcmv in git. That being said, I'm +1 on git first, especially since = the original srcmv instructions have probably suffered from some code = rot at this point. Adam On Aug 7, 2011, at 2:41 PM, Chris Anderson wrote: > I agree we should do the srcmv thing after we move to git. No need to > introduce more complexity to the git/svn question. >=20 > Plus git is better at that sort of thing, in general, than svn, so > waiting until we are git makes sense to me. >=20 > Chris >=20 > On Mon, Aug 1, 2011 at 1:37 PM, Robert Newson = wrote: >> +1 for doing the move afterwards. >>=20 >> 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. >>>=20 >>> On Mon, Aug 1, 2011 at 12:11, Robert Dionne = wrote: >>>=20 >>>> +1 >>>>=20 >>>>=20 >>>>=20 >>>>=20 >>>> On Jul 31, 2011, at 12:29 PM, Paul Davis wrote: >>>>=20 >>>>> Dearest Devs, >>>>>=20 >>>>> 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. >>>>>=20 >>>>> A few things on what this would mean for the community: >>>>>=20 >>>>> 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. >>>>>=20 >>>>> 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. >>>>>=20 >>>>> 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. >>>>>=20 >>>>> 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. >>>>>=20 >>>>> 5. There are probably other things, but this is mostly to just = kick >>>>> off serious discussion on making the switch. >>>>>=20 >>>>> Thoughts? >>>>>=20 >>>>> Paul >>>>=20 >>>>=20 >>>=20 >>=20 >=20 >=20 >=20 > --=20 > Chris Anderson > http://jchrisa.net > http://couchbase.com