Knut Anders Hatlen wrote:
Kristian Waagan <[EMAIL PROTECTED]> writes:
Hi Rick,
Thanks for looking at the patch.
This is the issue about renaming a class I warned about...
I'm able to apply the patch if I do a 'svn rename' first, but svn still
kind of objects.
Can anyone give me some advice on how to produce instructions or a diff
that can handle renaming/moving a file?
Hi Kristian,
I think your diff and instructions were fine. I did an 'svn rename'
before applying the patch, and everything went smoothly. What do you
mean by "svn still kind of objects"?
Hi Knut Anders,
Oops, writing mails too fast and too late at night. I meant "the patch
tool still kind of objects". You have to answer two questions before the
patch is applied.
Unless anyone else tell me how to do this, I'll keep it the way it is
and just try to communicate more clearly that the committer is required
to do a 'svn rename' before applying the patch.
BTW, this is the patch output:
...
patching file java/client/org/apache/derby/client/net/Request.java
The next patch would delete the file
java/client/org/apache/derby/client/net/UTF32BEEncodedInputStream.java,
which does not exist! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
patching file java/client/org/apache/derby/client/am/CrossConverters.java
patching file java/client/org/apache/derby/client/am/Blob.java
...
Regards,
--
Kristian
