The underlying VCS is Subversion. I have a shelved patch, which was ok until recently: I could diff it against the baseline. From today, I cannot diff or unshelve it anymore. There is an exception trace in the IDEA log file: 2008-03-07 13:01:27,223 [ 62621] INFO - ellij.openapi.vcs.VcsException - com.intellij.openapi.diff.impl.patch.ApplyPatchException: couldn't find context at com.intellij.openapi.diff.impl.patch.PatchHunk.a(PatchHunk.java:89) at com.intellij.openapi.diff.impl.patch.PatchHunk.a(PatchHunk.java:68) at com.intellij.openapi.diff.impl.patch.PatchHunk.apply(PatchHunk.java:41) at com.intellij.openapi.diff.impl.patch.FilePatch.applyModifications(FilePatch.java:60) at com.intellij.openapi.vcs.changes.shelf.ShelvedChange$PatchedContentRevision.a(ShelvedChange.java:2) at com.intellij.openapi.vcs.changes.shelf.ShelvedChange$PatchedContentRevision.getContent(ShelvedChange.java:23) at com.intellij.openapi.vcs.changes.actions.ShowDiffAction.a(ShowDiffAction.java:89) at com.intellij.openapi.vcs.changes.actions.ShowDiffAction.access$000(ShowDiffAction.java:3) at com.intellij.openapi.vcs.changes.actions.ShowDiffAction$4.run(ShowDiffAction.java:2) at com.intellij.openapi.progress.impl.ProgressManagerImpl$2.run(ProgressManagerImpl.java:1) at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:75) at com.intellij.openapi.progress.impl.ProgressManagerImpl.runProcess(ProgressManagerImpl.java:90) at com.intellij.openapi.application.impl.ApplicationImpl$7$1.run(ApplicationImpl.java:3) at com.intellij.openapi.application.impl.ApplicationImpl$5.run(ApplicationImpl.java:7) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:885) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:907) at java.lang.Thread.run(Thread.java:619) at com.intellij.openapi.application.impl.ApplicationImpl$1$1.run(ApplicationImpl.java:6)