Return-Path: Delivered-To: apmail-lucene-solr-dev-archive@locus.apache.org Received: (qmail 89483 invoked from network); 7 Oct 2008 00:03:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Oct 2008 00:03:28 -0000 Received: (qmail 67024 invoked by uid 500); 7 Oct 2008 00:03:27 -0000 Delivered-To: apmail-lucene-solr-dev-archive@lucene.apache.org Received: (qmail 66998 invoked by uid 500); 7 Oct 2008 00:03:26 -0000 Mailing-List: contact solr-dev-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: solr-dev@lucene.apache.org Delivered-To: mailing list solr-dev@lucene.apache.org Received: (qmail 66987 invoked by uid 99); 7 Oct 2008 00:03:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Oct 2008 17:03:26 -0700 X-ASF-Spam-Status: No, hits=0.1 required=10.0 tests=DNS_FROM_SECURITYSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [208.69.42.181] (HELO radix.cryptio.net) (208.69.42.181) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Oct 2008 00:02:24 +0000 Received: by radix.cryptio.net (Postfix, from userid 1007) id 3CD8A71C31A; Mon, 6 Oct 2008 17:02:30 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by radix.cryptio.net (Postfix) with ESMTP id 336EF71C1BC for ; Mon, 6 Oct 2008 17:02:30 -0700 (PDT) Date: Mon, 6 Oct 2008 17:02:30 -0700 (PDT) From: Chris Hostetter To: solr-dev@lucene.apache.org Subject: Re: svn commit: r702305 - /lucene/solr/branches/branch-1.3/src/java/org/apache/solr/handler/component/FacetComponent.java In-Reply-To: Message-ID: References: <20081006234829.9B453238887A@eris.apache.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Checked: Checked by ClamAV on apache.org : How do we do CHANGES.txt on the 1.3 branch? Add a 1.3.1 section on both the trunk (below 1.4) and the branch, keep them in sync. FWIW: The method Doug (i think it was Doug) recommend for dealing with point releases once upon a time (on Lucene-Java) was to commit all bug fixed to the trunk, mark the bug fixed in Jira, and if you thought it warranted a point release indicate that in Jira using the "Fix Version" -- but hold off on commiting anything to the branch until a decisison is made to actually do a point release -- then use search the "Fix Version" for issues and merge their specific commits onto the branch. the theory is that merging many things to the branch is easier to do at one time then in individual merges, and you'reless likely to run into problems if an initial bug fix turned out to have it's own bugs. Plus you don't waste a lot of work if it turns out the point release never actaully happens. -Hoss