KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
I have a patchfile like this: Index: dir/file.xml =================================================================== --- dir/file.xml (revision 178) +++ dir/file.xml (working copy) @@ -7,7 +7,7 @@ <markup> - <markup /> + <markup></markup> <markup> <markup> @@ -20,6 +20,7 @@ <markup> <markup> + <tag> <markup> To apply it to the SVN working copy, I branched it using: $ svn copy -r 178 trunk/component/dir branches/mybranch Then I tried $ cd branches/mybranch $ ls -R ./dir: file.xml $ patch -p0 -i ~/patchfile.patch but SVN's output is (Stripping trailing CRs from patch.) patching file dir/file.xml Hunk #1 FAILED at 7. Hunk #2 FAILED at 20. 2 out of 2 hunks FAILED -- saving rejects to file dir/file.xml.rej for every file? What could cause SVN to reject the patch? I am on a UNIX machine but patch and repository have Windows line-endings... Thanks for help!
Tags (comma-separated)
Save Edits
Cancel