Return-Path: X-Original-To: apmail-accumulo-dev-archive@www.apache.org Delivered-To: apmail-accumulo-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 8C80110D23 for ; Thu, 13 Jun 2013 02:46:06 +0000 (UTC) Received: (qmail 24623 invoked by uid 500); 13 Jun 2013 02:46:06 -0000 Delivered-To: apmail-accumulo-dev-archive@accumulo.apache.org Received: (qmail 24584 invoked by uid 500); 13 Jun 2013 02:46:06 -0000 Mailing-List: contact dev-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list dev@accumulo.apache.org Received: (qmail 24576 invoked by uid 99); 13 Jun 2013 02:46:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jun 2013 02:46:05 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of david.medinets@gmail.com designates 209.85.212.172 as permitted sender) Received: from [209.85.212.172] (HELO mail-wi0-f172.google.com) (209.85.212.172) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jun 2013 02:46:00 +0000 Received: by mail-wi0-f172.google.com with SMTP id c10so1083404wiw.5 for ; Wed, 12 Jun 2013 19:45:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=rrDqNJOglqVHnMa3CGu1HzTckU82pBLk72xcUj8JA2o=; b=iHB8JrR8jMmNOgQBBbq+eQj3TGdUSz54HblnnQ2iatTWtUpRlTM8/NDoUgIhNI/nQJ Gf0Ruv1KLPWafql2lsosr3XO/76umwebJZYiGOm8/btGsfvotuQ1tY80kOOeRCA/Qkui j63RBMP0dDwota9Eo1R9+ZUytCo9VVWlHgqs9SUTNKPXrWOioLWH1HY/oWyb5gY67Iza yIIw28lOFrOA9FgN74pg273ldaPLxu6Y0S6sx5BOHPVyghDZLByGwmHc40XKyiunjqH7 7hQkaWfotAmzOF+C5DWNg/v77GPgx5yeIaAkfjb6tb1FCoredyCMW81jqUt62TYH1V4z 6hWw== MIME-Version: 1.0 X-Received: by 10.180.92.226 with SMTP id cp2mr6293450wib.9.1371091539936; Wed, 12 Jun 2013 19:45:39 -0700 (PDT) Received: by 10.194.167.36 with HTTP; Wed, 12 Jun 2013 19:45:39 -0700 (PDT) In-Reply-To: References: <51AEAAD0.9020902@gmail.com> <51AFECB5.9010901@gmail.com> <51B68F00.6020904@gmail.com> <51B71E58.6010702@gmail.com> <51B74AAE.6030400@gmail.com> <51B7C4DB.5030104@gmail.com> Date: Wed, 12 Jun 2013 22:45:39 -0400 Message-ID: Subject: Re: [git] Documentation and Plan of Action From: David Medinets To: accumulo-dev Content-Type: multipart/alternative; boundary=f46d043c7f9031798304df0020b7 X-Virus-Checked: Checked by ClamAV on apache.org --f46d043c7f9031798304df0020b7 Content-Type: text/plain; charset=ISO-8859-1 It troubles me that we are referring to the master branch as unstable. While we are not following the dictums of Agile methodology it is clear to me that the master branch should always be potentially releasable. It is not a dumping ground for untested features or half-complete code. If something is incomplete, leave it in a branch. If you want to collaborate, create a github project and form a team. Only when the code is fully baked, merge it into the master. The SHA1 value of a change tracks it across all branches. No need to perform no-op merges. Simply check the branch history to see it contains the SHA1 hash you're interested in. I found the 'git show-graph' alias at http://gitready.com/intermediate/2009/01/26/text-based-graph.html to be helpful. Simply 'git show-graph | grep ' to easily find out if one change is included in a branch. If managing the releases inside one git repository seems prone to complications, create a separate repository for each release. After all, post-release there really should be only bug fixes. --f46d043c7f9031798304df0020b7--