Apply Patch problems

Hello.

I'm using SVN for VCS, IDEA 7.0.3. Whether I create patch file using IDEA or Tortoise SVN, I get the same errors when trying to "Show Diff" in "Apply Patch" window. One of:

  • Error loading changes for filename: couldn't find context

  • Error loading changes for filename: Context mismatch. Expected line: ... Found line: ...

Patch files themselves look OK to me. The only positive message I could get out of Show Diff is "The files are identical" or "The only difference is whitespace" (or some such).

Is that common, or I'm just lucky?

Thanks for help,
Yuri.

2 comments
Comment actions Permalink

Hello Yuri,

I'm using SVN for VCS, IDEA 7.0.3. Whether I create patch file using
IDEA or Tortoise SVN, I get the same errors when trying to "Show Diff"
in "Apply Patch" window. One of:

  • Error loading changes for filename: couldn't find context

  • Error loading changes for filename: Context mismatch. Expected

line: ... Found line: ...

Patch files themselves look OK to me. The only positive message I
could get out of Show Diff is "The files are identical" or "The only
difference is whitespace" (or some such).

Is that common, or I'm just lucky?


Does "Apply Patch" itself work? Are the patches actually conflicting?

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


0
Comment actions Permalink

Hi,

I have similar "Apply Patch" problem here (on IntelliJ #7878):

Expected line:

Found line:
//

And the patch applying doesn't work.
Did you find a solution?

Thanks,
Yuri (another one :)

0

Please sign in to leave a comment.