From dev-return-12596-apmail-forrest-dev-archive=forrest.apache.org@forrest.apache.org Thu Oct 07 15:24:53 2004 Return-Path: Delivered-To: apmail-forrest-dev-archive@www.apache.org Received: (qmail 69167 invoked from network); 7 Oct 2004 15:24:52 -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:24:52 -0000 Received: (qmail 74416 invoked by uid 500); 7 Oct 2004 15:24:51 -0000 Delivered-To: apmail-forrest-dev-archive@forrest.apache.org Received: (qmail 74366 invoked by uid 500); 7 Oct 2004 15:24:50 -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 74355 invoked by uid 99); 7 Oct 2004 15:24:50 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from [65.42.175.122] (HELO ferrari.solidusdesign.com) (65.42.175.122) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 07 Oct 2004 08:24:49 -0700 Received: (qmail 6827 invoked from network); 7 Oct 2004 15:24:47 -0000 Received: from unknown (HELO localhost) (192.168.3.2) by 0 with SMTP; 7 Oct 2004 15:24:47 -0000 Received: from arthur.csx.calvin.edu (arthur.csx.calvin.edu [153.106.130.19]) by secure.solidusdesign.com (IMP) with HTTP for ; Thu, 7 Oct 2004 11:24:47 -0400 Message-ID: <1097162687.41655fbf274a5@secure.solidusdesign.com> Date: Thu, 7 Oct 2004 11:24:47 -0400 From: Dave Brondsema To: dev@forrest.apache.org Subject: Re: Advice on managing branches References: <41655E0C.1000007@apache.org> In-Reply-To: <41655E0C.1000007@apache.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit User-Agent: Internet Messaging Program (IMP) 3.2.1 X-Originating-IP: 153.106.130.19 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on ferrari X-Spam-Level: X-Spam-Status: No, hits=0.2 required=4.0 tests=HTTP_WITH_EMAIL_IN_URL autolearn=no version=2.63 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Quoting Ross Gardler : > 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 > I would suggest only doing the merging when you take the branch back into the trunk. If their are critical changes in the trunk, you can merge that into the branch. A minimalistic approach to merging will keep the branch's topic clear and understandable and will make the final merge easier. http://svnbook.red-bean.com/svnbook-1.0/ch04s03.html#svn-ch-4-sect-3.2 might help some. Notably, SVN doesn't record info about merge operations, so merge changes must be tracked manually (by checking logs, and putting revision #s in comments). -- Dave Brondsema : dave@brondsema.net http://www.brondsema.net : personal http://www.splike.com : programming http://csx.calvin.edu : student org