Patch File Format

I've just tried applying a patch generated by IDEA with TortoiseSVN, both of which say they use the unified diff format, and am getting the following error:

"The line "Index: " was not found!
Either this is not a diff file or the diff is empty."

Looking at the format of the patch files generated by both applications, there is a noticable difference in that TortoiseSVN has an extra line of the following for every file which is part of the diff:

Index: path_to_file

Having no knowledge of the unified diff format, is this a bug in IDEA or in TortoiseSVN?

3 comments

Sorry, I should also mention I'm using Subversion 1.4 on the client-side.

0

Hello Simon,

I've just tried applying a patch generated by IDEA with TortoiseSVN,
both of which say they use the unified diff format, and am getting the
following error:

"The line "Index: " was not found!
Either this is not a diff file or the diff is empty."
Looking at the format of the patch files generated by both
applications, there is a noticable difference in that TortoiseSVN has
an extra line of the following for every file which is part of the
diff:

Index: path_to_file

Having no knowledge of the unified diff format, is this a bug in IDEA
or in TortoiseSVN?


Given that there is no such thing as an official spec for the format, this
question is hard to answer. :) However, Eclipse seems to require this as
well, so I think it should better be added. See IDEADEV-15970.

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

Please sign in to leave a comment.