Sachin Patel wrote:
It also put this at a top of bunch of the files...
<<<<<<< .mine
Any idea what that means?
This is caused when you do an svn update and it has conflicts with your
current file. The <<<<<< .mine is showing what your version of the file
had.
Jeff
Sachin Patel wrote:
No!!!!! I did an svn update and it wiped out all my local changes :(.
So I can't recreate the patch now at all. Is that current patch not
usable at all?
Geir Magnusson Jr. wrote:
909 seems hosed in a different way. Can you re-create the patch
after svn updating and add that to the JIRA?
884 : done
On Aug 24, 2005, at 8:10 PM, Sachin Patel wrote:
Yes, 909 needs to be checked in and 884 can be checked in now also.
Geir Magnusson Jr. wrote:
899 : Done
884 : needs to be submitted under the Apache license
885 : done
907 : done
902 : done
what about 909?
On Aug 24, 2005, at 6:38 AM, 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]
