Return-Path: Delivered-To: apmail-incubator-jspwiki-commits-archive@locus.apache.org Received: (qmail 97012 invoked from network); 24 Feb 2008 19:01:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Feb 2008 19:01:46 -0000 Received: (qmail 87912 invoked by uid 500); 24 Feb 2008 19:01:36 -0000 Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org Received: (qmail 87897 invoked by uid 500); 24 Feb 2008 19:01:35 -0000 Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-commits@incubator.apache.org Received: (qmail 87876 invoked by uid 99); 24 Feb 2008 19:01:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Feb 2008 11:01:35 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Feb 2008 19:00:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C45581A9832; Sun, 24 Feb 2008 11:01:16 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r630659 - /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes Date: Sun, 24 Feb 2008 19:01:16 -0000 To: jspwiki-commits@incubator.apache.org From: ajaquith@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080224190116.C45581A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ajaquith Date: Sun Feb 24 11:01:13 2008 New Revision: 630659 URL: http://svn.apache.org/viewvc?rev=630659&view=rev Log: Added ChangeLog convention for merge notes. Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes?rev=630659&r1=630658&r2=630659&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes Sun Feb 24 11:01:13 2008 @@ -1,5 +1,11 @@ 2007-2-24 Andrew Jaquith - * Merged with trunk 2.6.2-svn-2 + * Merged with trunk 2.6.2-svn-2 (revisions 630646:630650) * Added ChangeLog-Stripes to keep track of Stripes-related changes separately. + Note to self: when merging from trunk, each "Merged with trunk" entry + assumes merging from this branch: + + https://svn.apache.org/repos/asf/incubator/jspwiki/trunk + + ...and each entry will specify the revisions it merges from and to (from:to).