svn diff to create diffs + TortoiseSVN to apply patches -----Original Message----- From: Barrie Treloar [mailto:[EMAIL PROTECTED] Sent: Wednesday, July 26, 2006 6:35 PM To: Maven Developers List Subject: What patch program do people use on Windows XP?
I've done some work at home (on a Windows XP machine) and submitted patches to the JIRA issues. When I take a copy of those patches to work (also on a Windows XP machine) I need to apply these patches somehow. I created the patches using the subclipse plugin for Eclipse. I've also created another version of the patch using svn diff. I downloaded gnu patch for windows: >patch --version patch 2.5.9 Copyright (C) 1988 Larry Wall Copyright (C) 2003 Free Software Foundation, Inc. which appears to be the latest version and when I attempt to patch the files I get prompted because the unified diff doesn't appear to be quite in the format that diff expects. >patch -p0 < ..\SVN-130.txt patching file src/site/site.xml patching file src/site/apt/introduction.apt missing header for unified diff at line 99 of patch can't find file to patch at input line 99 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- So you can that some files get patched correctly while others fail. I think the others fail because they have the diff information (like @@ -8,45 +8,45 @@) but they are missing the Index: and --- and +++ file information) with the assumption that if there has been no new Index: then the diff is applying to the same file (makes sense) So why doesn't the windows gnu patch work? What program should I be using? --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
