On 10/28/05, Daniel John Debrunner <[EMAIL PROTECTED]> wrote: > Andrew McIntyre wrote: > > From the top of the tree: > > > > svn up -r 329186 > > svn diff > my.patch > > svn revert -R * > > svn up > > patch -p0 < my.patch > > > > No warranties, expressed or implied. Use at your own risk, make a > > backup (or patch a different view) if you're really worried, etc. :-) > > That seemed like a great idea, but didn't work for me. :-( > > With just the svn update I had only one file in conflict. > > Then following Andrew's steps (as a test), the patch failed on most of > my modified files. > > Your mileage may vary ... > > Now see if I can go back (again) to 329186 and apply my patch ...
Is the patch failing because of diffs in whitespace or eol characters? If you're using Gnu patch, try the -l flag patch to ignore whitespace (including, I believe, the specific eol characters used) when attempting to match patterns. andrew
