On May 11, 2005, at 5:15 PM, Bernt M. Johnsen wrote:
Army wrote (2005-05-11 16:18:42):I did have problems applying the patch to the my local codeline, and I'm
pretty sure it was because of this. In order to get the patch to apply, I
manually copied "DB2Limit.java" to "Limits.java"--after doing that (and
only that), I was then able to successfully apply the patch. So whoever
commits this might need to do the same, or else use some other trick to get
the patch to apply correctly.
Seems to me that this is a weakness in the way we submit pathces (probably a weakness in svn).
This is due to the fact that svn and patch can't communicate about file additions/deletions/renames (or property settings for that matter). They can only communicate the textual differences of specific files between them. It would be nice if svn had a patch command that accepted the contents of svn diff and applied all changes including additions/renames/proeprty settings, but I suppose that is something to take up with the subversion developers.
I think the proper thing to do in this specific case, for a committer that is attempting to apply the patch, is to 'svn move DB2Limit.java Limits.java' before attempting to apply the change so that the history of Limits.java (as DB2Limit.java) is preserved after the patch is committed.
andrew
