From commits-return-12516-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Tue Apr 10 13:14:50 2012 Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-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 84AD09146 for ; Tue, 10 Apr 2012 13:14:50 +0000 (UTC) Received: (qmail 51135 invoked by uid 500); 10 Apr 2012 13:14:50 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 51090 invoked by uid 500); 10 Apr 2012 13:14:50 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 51081 invoked by uid 99); 10 Apr 2012 13:14:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2012 13:14:50 +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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2012 13:14:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0A01023888FE for ; Tue, 10 Apr 2012 13:14:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1311706 - /apr/site/trunk/xdocs/guidelines.xml Date: Tue, 10 Apr 2012 13:14:26 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120410131427.0A01023888FE@eris.apache.org> Author: trawick Date: Tue Apr 10 13:14:26 2012 New Revision: 1311706 URL: http://svn.apache.org/viewvc?rev=1311706&view=rev Log: document procedures related to CHANGES and branch maintenance Modified: apr/site/trunk/xdocs/guidelines.xml Modified: apr/site/trunk/xdocs/guidelines.xml URL: http://svn.apache.org/viewvc/apr/site/trunk/xdocs/guidelines.xml?rev=1311706&r1=1311705&r2=1311706&view=diff ============================================================================== --- apr/site/trunk/xdocs/guidelines.xml (original) +++ apr/site/trunk/xdocs/guidelines.xml Tue Apr 10 13:14:26 2012 @@ -54,6 +54,53 @@ Then Commit" (RTC) process.

+CHANGES entries + +

The goals for CHANGES entries are to provide this documentation +for user-visible changes and to limit this documentation to releases +which introduced the change. Fixes to features which have not yet been +released don't warrant an entry as they are part of the initial release +of the feature. CHANGES for one branch shouldn't duplicate entries for +earlier branches except when releases introducing the fix are created +from both branches.

+ +

Modifications expected to remain only in trunk, at least for some +time, should be accompanied by a CHANGES entry in trunk (if a CHANGES +entry is appropriate at all).

+ +
+ +
+Branch maintenance + +

Many changes which are committed to trunk are also delivered to other +branches. The procedure used is outlined below.

+ +

+Commit to trunk, 1.9.x, 1.8.x, etc. down to the actively maintained +stable branch. In cases where the actively maintained stable branch +has recently changed, such as when moving from 1.3.x to 1.4.x in order +to release new features, it is up to the committer to decide whether to +commit to the previous actively maintained stable branch. (There is +at least limited value in having the project decide what the patch for +some branch is even if there are no clear plans to release it, as some +users may need to continue using the previous branch for some time +until they can vet the changes in the current branch.)

+ +

Commit messages for the branches always explicitly reference the trunk +revision. In particular, note that Subversion mergeinfo is not a +sufficient record because it does not show up in commonly-used views of +revision history.

+ +

When a CHANGES entry is needed for the modifications committed to a +branch, the CHANGES entry should be part of the commit, whether or not +it was part of the trunk revision being backported. (A CHANGES entry is +commonly omitted from the trunk commit if a backport will be performed +almost immediately.)

+ +
+ +
PMC Membership

PMC membership is attained through a "consensus approval" process