Re: [patch] [doc] updatable ResultSets [having trouble applying patch]

2005-05-05 Thread Jean T. Anderson
I'm having trouble applying this patch, but perhaps I'm not getting the patch syntax correct. I've succeeded previously applying Jeff's patches that modified just one file, and this is the first time I have tried to apply a patch that modifies more than one file. So, it modifies three files rel

Re: [patch] [doc] updatable ResultSets [having trouble applying patch]

2005-05-05 Thread Jean T. Anderson
Jean T. Anderson wrote: By the way, I tried to apply this with the DITA source at revision 168249. Jeff, what was the revision of your local copy when you produced the patch? --There is a backlog of patches to apply in Jira (and which I'll try to catch up on). I'm wondering if it's possible this

Re: [patch] [doc] updatable ResultSets [having trouble applying patch]

2005-05-05 Thread Jeff Levitt
I just created a new patch, and it seems that the "src/" was left off the file names in the first patch. Maybe that has something to do with it? I created the attached diff from the trunk. Its also a more current revision number. Does it work? --- "Jean T. Anderson" <[EMAIL PROTECTED]> wrote:

Re: [patch] [doc] updatable ResultSets [having trouble applying patch]

2005-05-05 Thread scott hutinger
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

Re: [patch] [doc] updatable ResultSets [having trouble applying patch]

2005-05-05 Thread Jeff Levitt
--- 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 w

Re: [patch] [doc] updatable ResultSets [having trouble applying patch]

2005-05-05 Thread Jean T. Anderson
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

Re: [patch] [doc] updatable ResultSets [having trouble applying patch]

2005-05-05 Thread Jean T. Anderson
Jeff Levitt wrote: I just created a new patch, and it seems that the "src/" was left off the file names in the first patch. Maybe that has something to do with it? I created the attached diff from the trunk. Its also a more current revision number. Does it work? The patch applied without any err