Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8AE547C5D for ; Mon, 21 Nov 2011 09:39:41 +0000 (UTC) Received: (qmail 24345 invoked by uid 500); 21 Nov 2011 09:39:41 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 24277 invoked by uid 500); 21 Nov 2011 09:39:40 -0000 Mailing-List: contact commits-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 commits@couchdb.apache.org Received: (qmail 24270 invoked by uid 500); 21 Nov 2011 09:39:40 -0000 Delivered-To: apmail-incubator-couchdb-commits@incubator.apache.org Received: (qmail 24266 invoked by uid 99); 21 Nov 2011 09:39:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Nov 2011 09:39:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.131] (HELO eos.apache.org) (140.211.11.131) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Nov 2011 09:39:38 +0000 Received: from eos.apache.org (localhost [127.0.0.1]) by eos.apache.org (Postfix) with ESMTP id 356D2A2F for ; Mon, 21 Nov 2011 09:39:17 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Apache Wiki To: Apache Wiki Date: Mon, 21 Nov 2011 09:39:16 -0000 Message-ID: <20111121093916.83514.47448@eos.apache.org> Subject: =?utf-8?q?=5BCouchdb_Wiki=5D_Trivial_Update_of_=22Git=5FAt=5FApache=5FGui?= =?utf-8?q?de=22_by_ChristianGrobmeier?= Auto-Submitted: auto-generated X-Virus-Checked: Checked by ClamAV on apache.org Dear Wiki user, You have subscribed to a wiki page or wiki category on "Couchdb Wiki" for c= hange notification. The "Git_At_Apache_Guide" page has been changed by ChristianGrobmeier: http://wiki.apache.org/couchdb/Git_At_Apache_Guide?action=3Ddiff&rev1=3D29&= rev2=3D30 Comment: comment and link to release procedure added 1. git-rebase, git-stash and stashing via git-merge --interactive is onl= y allowed if the history of external contributions remains preserved. 1. It must not be possible to delete release tags. = + ''grobmeier: deleting tags is possible with SVN, for example when the RC1= tag has failed the vote. Why isn't it allowed with git?'' + = + = =3D=3D Non-ASF repository collaboration =3D=3D 1. Doing a test feature branch in private or in a forked github reposito= ry is perfectly fine. But committers should push to the canonical ASF repos= itory early and often to prevent a fragmentation of the community developme= nt effort. 1. Even if GIT supports the additional author information, the establish= ed policy that committers should apply their commits to the canonical repos= itory themself remains intact. @@ -39, +42 @@ 1. The project documentation and project site shall mention the apache.o= rg based GIT repo as the canonical source location. = =3D=3D Cutting Releases with GIT =3D=3D + = + The release plan from couchdb can be found here: http://wiki.apache.org/c= ouchdb/Release_procedure + = Apache Maven supports the usage of GIT with the [[http://maven.apache.org= /scm/git.html|maven-scm-providers-git]] since 2008. = Be aware that the branch created by a release with GIT always covers the = whole repository.