Return-Path: Delivered-To: apmail-forrest-dev-archive@www.apache.org Received: (qmail 64516 invoked from network); 7 Oct 2004 15:17:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 7 Oct 2004 15:17:47 -0000 Received: (qmail 63589 invoked by uid 500); 7 Oct 2004 15:17:45 -0000 Delivered-To: apmail-forrest-dev-archive@forrest.apache.org Received: (qmail 63537 invoked by uid 500); 7 Oct 2004 15:17:45 -0000 Mailing-List: contact dev-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@forrest.apache.org Delivered-To: mailing list dev@forrest.apache.org Received: (qmail 63522 invoked by uid 99); 7 Oct 2004 15:17:45 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (hermes.apache.org: local policy) Received: from [212.23.3.140] (HELO pythagoras.zen.co.uk) (212.23.3.140) by apache.org (qpsmtpd/0.28) with ESMTP; Thu, 07 Oct 2004 08:17:44 -0700 Received: from [82.69.78.226] (helo=[192.168.0.2]) by pythagoras.zen.co.uk with esmtp (Exim 4.30) id 1CFa1W-000485-AF for dev@forrest.apache.org; Thu, 07 Oct 2004 15:17:42 +0000 Message-ID: <41655E0C.1000007@apache.org> Date: Thu, 07 Oct 2004 16:17:32 +0100 From: Ross Gardler User-Agent: Mozilla Thunderbird 0.8 (Windows/20040913) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Forrest Developers List Subject: Advice on managing branches Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Originating-Pythagoras-IP: [82.69.78.226] X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N As you have probably realised I have a branch for the sitemap-plugins. As a result of a mail from Sean Wheller (http://issues.apache.org/eyebrowse/ReadMsg?listName=dev@forrest.apache.org&msgNo=14296) I am considering whether or not I should merge the changes from trunk into the branch. Sean says: "The diff between trunk and the sitemap-plugins is huge. It seams that the branch is drifting far away from the trunk.... This increases the likely hood that use of the standard svn switch dev method will not work." However, I am not sure that this is the case. The branch works, although Sean is experiencing problems wehn doind a switch, but not when doing a co of the branch (we haven't got to the root cause yet of this yet). I have been watching commits to trunk, the only changes appear to be skin and documentation changes which have no direct affect on the branch. So, the question I want to ask is this. Should I bother merging the changes in trunk into the branch at this stage. I am particularly concerned about this because of the number of svn commit messages this will generate that will be of no value to devs. Advice please... Ross