Return-Path: Delivered-To: apmail-continuum-dev-archive@www.apache.org Received: (qmail 88957 invoked from network); 15 Jan 2010 07:06:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Jan 2010 07:06:52 -0000 Received: (qmail 72773 invoked by uid 500); 15 Jan 2010 07:06:52 -0000 Delivered-To: apmail-continuum-dev-archive@continuum.apache.org Received: (qmail 72691 invoked by uid 500); 15 Jan 2010 07:06:52 -0000 Mailing-List: contact dev-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list dev@continuum.apache.org Received: (qmail 72681 invoked by uid 99); 15 Jan 2010 07:06:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2010 07:06:51 +0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [83.219.192.166] (HELO smtp.bredband2.com) (83.219.192.166) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2010 07:06:40 +0000 Received: from [192.168.0.3] (c-94-255-200-136.cust.bredband2.com [94.255.200.136]) (Authenticated sender: ed5133) by smtp.bredband2.com (Postfix) with ESMTPA id 80AE3161BAF for ; Fri, 15 Jan 2010 08:06:08 +0100 (CET) Message-ID: <4B5013E0.2010504@apache.org> Date: Fri, 15 Jan 2010 08:06:08 +0100 From: Dennis Lundberg User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: dev@continuum.apache.org Subject: Re: svn commit: r899473 - in /continuum/trunk: ./ continuum-docs/src/site/ continuum-docs/src/site/apt/installation/ continuum-docs/src/site/apt/user_guides/building_project/ continuum-docs/src/site/apt/user_guides/managing_project/ References: <20100114233435.8655323888BD@eris.apache.org> In-Reply-To: X-Enigmail-Version: 0.96.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Bredband2-MailScanner: Found to be clean X-Bredband2-MailScanner-From: dennisl@apache.org X-Virus-Checked: Checked by ClamAV on apache.org X-Old-Spam-Status: No Brett Porter wrote: > Thanks Dennis! > > On 15/01/2010, at 10:34 AM, dennisl@apache.org wrote: > >> Manually merged from 1.3.x branch. > > Just curious, but why is manual merging needed? Once I'd updated the other day, I had all the mergeinfo up to date such that you could remerge the entire branch and get just the changes. That's a good question, that I asked myself before doing the manual merge. I wasn't sure that I would be able to do an automatic merge, because a couple of the files in the first commit are different (content wise) in the branch compared to trunk. And the changes I made was very close to the different parts of those files. If you want me to I'll revert and try to do an automatic merge instead, so that the mergeinfo is correct. I'll could at least exclude the 3 files that are different into a separate commit, and manually merge that one if necessary. > - Brett > > -- > Brett Porter > brett@apache.org > http://brettporter.wordpress.com/ > > > > > -- Dennis Lundberg