Hi.
I tried svnpatch-diff branch on Windows XP.
I got the followging error when patching.
---------------------------------------------------------------------
D:\...>svn patch out.txt
patching file build.conf
patching file www/hacking.html
Assertion failed: hunk, file ../patch-2.5.9-src/patch.c, line 354
This application has requested the Runtime to terminate it in an unusual way.
Please contact the application's support team for more information.
svn: No 'patch' program was found in your system. Please try
to use --patch-cmd or 'patch-cmd' run-time configuration
option or manually use an external tool to apply Unidiffs.
svn: External program is missing
---------------------------------------------------------------------
patch program is usaually not available on Windows.
'svn diff' command also has '--diff-cmd' option, but it uses built-in
diff if the option is omitted.
I think 'svn patch' also should use built-in patch if '--patch-cmd'
option is omitted.
These are the detailed steps which I tried.
1. checkout http://svn.collab.net/repos/svn/branches/svnpatch-diff
2. merge all from trunk to the working copy.
(because I can't compile the branch on r33217)
3. compile and install it.
4. "svn diff --svnpatch > out.txt" on the working copy.
5. checkout the branch as a new working copy.
6. 'svn patch out.txt" to the new working copy.
7. I got the error.
Regards.
Masaru.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-21 04:11:42 CEST