Return-Path: Delivered-To: apmail-forrest-dev-archive@www.apache.org Received: (qmail 11994 invoked from network); 1 Feb 2008 22:43:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Feb 2008 22:43:33 -0000 Received: (qmail 43411 invoked by uid 500); 1 Feb 2008 22:43:24 -0000 Delivered-To: apmail-forrest-dev-archive@forrest.apache.org Received: (qmail 43347 invoked by uid 500); 1 Feb 2008 22:43:24 -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 List-Id: Delivered-To: mailing list dev@forrest.apache.org Received: (qmail 43336 invoked by uid 99); 1 Feb 2008 22:43:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2008 14:43:24 -0800 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [66.111.4.26] (HELO out2.smtp.messagingengine.com) (66.111.4.26) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2008 22:43:09 +0000 Received: from compute1.internal (compute1.internal [10.202.2.41]) by out1.messagingengine.com (Postfix) with ESMTP id 117698ED54 for ; Fri, 1 Feb 2008 17:43:02 -0500 (EST) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute1.internal (MEProxy); Fri, 01 Feb 2008 17:43:02 -0500 X-Sasl-enc: a0dyCTDsWZw2Rk+cIqQ+rfLPC54qQpX0o9q61Lr4rwQG 1201905780 Received: from localhost (dsl-41-216.nsw1.net.au [125.168.41.216]) by mail.messagingengine.com (Postfix) with ESMTP id E282F25BBC for ; Fri, 1 Feb 2008 17:43:00 -0500 (EST) Date: Sat, 2 Feb 2008 09:42:57 +1100 From: David Crossley To: dev@forrest.apache.org Subject: Re: How to merge FOP94-branch Message-ID: <20080201224257.GA8909@igg.indexgeo.com.au> References: <47A0564A.4080305@apache.org> <47A074B6.1040104@apache.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <47A074B6.1040104@apache.org> User-Agent: Mutt/1.4.2.2i X-Virus-Checked: Checked by ClamAV on apache.org Ross Gardler wrote: > Ferdinand Soethe wrote: > > >- merge all changes > > You should merge changes from the whole trunk into branch first and then > test. If all goes well you can merge back into trunk. This step is not > required but sometimes it sometimes highlights a change in trunk that > affects your changes in the branch. I see that Ferdinand and Johannes are doing piecemeal changes to the branch. I reckon that you would do better to follow Ross' advice. Remember that we got into big trouble one time and couldn't later merge to trunk. -David