I used this command last night to commit the patch for DERBY-234 and had no problems:

   patch -p0 -i derby234.diff

I'll try Jeff's new patch.

thanks,

 -jean

Jeff Levitt wrote:
--- scott hutinger
<[EMAIL PROTECTED]> wrote:

I always use (in linux/unix)

patch -p0 < patchfile.diff

The -p0 means use the current path. For example, if
the diff was created in trunk, then if you are trying to patch in
trunk, then I always use -p0. If, for some reason, I was down one
level in src, and the diff was from the trunk, then I would use: patch
-p1 < patchfile.diff. That get's rid of the trunk path.


Cool thanks Scott!  Jean, can you try committing the
original patch that was failing with Scott's suggested
command?  If it still fails, then try the one I just
sent tonight.  I think the one you were failing with
should be tried first to see if it works.





Reply via email to