Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 16274 invoked from network); 24 Aug 2005 19:35:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Aug 2005 19:35:57 -0000 Received: (qmail 41784 invoked by uid 500); 24 Aug 2005 19:35:49 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 41718 invoked by uid 500); 24 Aug 2005 19:35:49 -0000 Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list dev@geronimo.apache.org Received: (qmail 41669 invoked by uid 99); 24 Aug 2005 19:35:49 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2005 12:35:49 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy includes SPF record at spf.trusted-forwarder.org) Received: from [66.163.170.9] (HELO smtp111.mail.sc5.yahoo.com) (66.163.170.9) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 24 Aug 2005 12:36:06 -0700 Received: (qmail 69116 invoked from network); 24 Aug 2005 19:35:47 -0000 Received: from unknown (HELO ?9.27.152.140?) (spalias78@129.33.49.251 with plain) by smtp111.mail.sc5.yahoo.com with SMTP; 24 Aug 2005 19:35:46 -0000 Message-ID: <430CCC11.8050304@gmail.com> Date: Wed, 24 Aug 2005 15:35:45 -0400 From: Sachin Patel User-Agent: Mozilla Thunderbird 1.0+ (Windows/20050712) MIME-Version: 1.0 To: dev@geronimo.apache.org Subject: Re: tooling patches References: <430A6B4A.7050504@gmail.com> <430B9665.8000005@gmail.com> <0470B72C-287A-45D3-9950-2FEEA8611B22@apache.org> <430C8C68.2000503@gmail.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Please see if you can apply 889 & 909 as well. 889 introduces a new file, so I'm curious to see if theres problems applying that one. Thanks. Geir Magnusson Jr. wrote: > > On Aug 24, 2005, at 11:04 AM, Sachin Patel wrote: > >> I was using the Eclipse UI Subversion plugin to create the patches, >> and it seems to put absolute paths in the patch file which may have >> caused your errors. Let me create a new jira and I'll submit >> patches using "svn diff" for the .core and .ui plugins. > > Well, I was able to deal with the absolute paths. That's workable. > (the -p flag) > > But even then, it it had problems w/ the chunks. I thought it may be > a line ending issues (DOS vs Unix vs Mac), but no such luck. > > lets try with something simple when I get home to figure out the real > prolbem > > geir > >> >> Thanks. Sachin. >> >> Geir Magnusson Jr. wrote: >> >>> Patches? We don't need no steenkeeng patches... >>> >>> 884 - please resubmit and grant ASF license >>> 885 - I couldn't get this to apply successfully. I'm not sure >>> why. Most chunks failed. >>> 888 - done >>> 907 - failed like 885. I figured I'm doing something wrong, but >>> it's just not obvious. >>> >>> geir >>> >>> >>> On Aug 23, 2005, at 5:34 PM, Sachin Patel wrote: >>> >>> >>>> Add 907 to the list. Thanks. >>>> >>>> Sachin Patel wrote: >>>> >>>> >>>>> Would one of the committers mind checking in the patches for >>>>> 884,885, and 888? I'm making changes on source files that >>>>> already have existing pending patches in these jiras and don't >>>>> want to introduce new patches until their checked to avoid >>>>> conflicts when merging. For my knowledge, how is this handled? >>>>> Are cumulative patches easily handled? i.e What happens if i >>>>> have Patch-A based on revision 1 on File-A. Then I introduce >>>>> Patch-B on File-A also based on revision 1 (but includes changes >>>>> that went into Patch A). Since both of the patches are based on >>>>> the same revision # I would assume that only one of the patches >>>>> can be applied without errors or conflicts. What happens when >>>>> the second patch is applied since the patch is no longer based >>>>> on the revision specified in the patch file? If the second patch >>>>> cannot be applied, how is one expected to know which patch to >>>>> throw out? >>>>> >>>>> Thanks. >>>>> >>>>> Sachin. >>>>> >>>>> >>>>> >>>> >>>> >>>> >>> >>> >> >> >