new files work well.  It's just patching the existing stuff.

On Aug 24, 2005, at 3:35 PM, Sachin Patel wrote:

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.



















--
Geir Magnusson Jr                                  +1-203-665-6437
[EMAIL PROTECTED]


Reply via email to