patches

Can PyCharm generated patches be used with linux patch tool?  It seems patch doesn't understand the generated syntax:

harrier{623}$ patch --dry-run -i ~/Added_more_offset_to_detail_popout,_added_links_from_scoreboard_to_the_respective_project_.patch
(Stripping trailing CRs from patch.)
can't find file to patch at input line 8
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/scam/raft/templates/raft/portal/index.html
|IDEA additional info:
|Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|<+>UTF-8
|===================================================================
|--- src/scam/raft/templates/raft/portal/index.html     (revision 27736)
|+++ src/scam/raft/templates/raft/portal/index.html     (revision 27737)
--------------------------
File to patch:
prettyPrint();

Line 8 mentioned in the error message being:
@@ -33,25 +33,25 @@
prettyPrint();

It's possible I need to apply the right combination of command line parameters, but I'm not really experienced with patching and would appreciate some help.


Thanks
Dmitry
2 comments
I'm not sure if it's possible to make 'patch' ignore the extra information stored by IDEA, but we're going to make it possible to turn off the writing of this information: http://youtrack.jetbrains.com/issue/IDEA-114586
0

Please sign in to leave a comment.