Cannot get back to normal after shelving changes failed

Tried to shelve about 10 changed and added files, but got an error like "cannot find XXX.java.svn-base". Because I couldn't shelve the changes, I reverted them. But now all files that were reverted are shown in red font in the project view and editor tabs. How can I get back to normal? IDE restart, invalidate caches, reimport Maven project, full rebuild don't help.     

2 comments
Comment actions Permalink

Maybe the problem is related to the following exception which is reported regularly?

null
java.lang.AssertionError
 at com.intellij.openapi.vcs.changes.conflicts.ChangelistConflictNotificationPanel.<init>(ChangelistConflictNotificationPanel.java:14)
 at com.intellij.openapi.vcs.changes.conflicts.ChangelistConflictTracker$4.run(ChangelistConflictTracker.java:4)
 at com.intellij.openapi.application.impl.ApplicationImpl.runReadAction(ApplicationImpl.java:346)
 at com.intellij.openapi.vcs.changes.conflicts.ChangelistConflictTracker.a(ChangelistConflictTracker.java:14)
 at com.intellij.openapi.vcs.changes.conflicts.ChangelistConflictTracker.access$500(ChangelistConflictTracker.java:101)
 at com.intellij.openapi.vcs.changes.conflicts.ChangelistConflictTracker$3.fileOpened(ChangelistConflictTracker.java:3)
 at sun.reflect.GeneratedMethodAccessor48.invoke(Unknown Source)
 at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
 at java.lang.reflect.Method.invoke(Method.java:597)
 at com.intellij.util.messages.impl.MessageBusConnectionImpl.deliverMessage(MessageBusConnectionImpl.java:101)
 at com.intellij.util.messages.impl.MessageBusImpl.doPumpMessages(MessageBusImpl.java:183)
 at com.intellij.util.messages.impl.MessageBusImpl.doPumpMessages(MessageBusImpl.java:188)
 at com.intellij.util.messages.impl.MessageBusImpl.pumpMessages(MessageBusImpl.java:175)
 at com.intellij.util.messages.impl.MessageBusImpl.pumpMessages(MessageBusImpl.java:172)
 at com.intellij.util.messages.impl.MessageBusImpl.sendMessage(MessageBusImpl.java:167)
 at com.intellij.util.messages.impl.MessageBusImpl.access$000(MessageBusImpl.java:40)
 at com.intellij.util.messages.impl.MessageBusImpl$2.invoke(MessageBusImpl.java:106)
 at $Proxy79.fileOpened(Unknown Source)
 at com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl.openFileImpl3(FileEditorManagerImpl.java:455)
 at com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl$5.run(FileEditorManagerImpl.java:2)
 at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:91)
 at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:62)
 at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:143)
 at com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl.openFileImpl2(FileEditorManagerImpl.java:203)
 at com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl.openFileWithProviders(FileEditorManagerImpl.java:11)
 at com.intellij.openapi.fileEditor.ex.FileEditorManagerEx.openFile(FileEditorManagerEx.java:3)
 at com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl$7.run(FileEditorManagerImpl.java:15)
 at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:119)
 at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:62)
 at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:143)
 at com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl.openEditor(FileEditorManagerImpl.java:73)
 at com.intellij.openapi.fileEditor.OpenFileDescriptor.navigateInAnyFileEditor(OpenFileDescriptor.java:133)
 at com.intellij.openapi.fileEditor.OpenFileDescriptor.navigateInEditor(OpenFileDescriptor.java:118)
 at com.intellij.openapi.fileEditor.OpenFileDescriptor.navigate(OpenFileDescriptor.java:105)
 at com.intellij.psi.impl.source.JavaStubPsiElement.navigate(JavaStubPsiElement.java:36)
 at com.intellij.ide.projectView.impl.nodes.AbstractPsiBasedNode.navigate(AbstractPsiBasedNode.java:58)
 at com.intellij.util.OpenSourceUtil.navigate(OpenSourceUtil.java:41)
 at com.intellij.util.OpenSourceUtil.openSourcesFrom(OpenSourceUtil.java:30)
 at com.intellij.util.EditSourceOnDoubleClickHandler$TreeMouseListener.processDoubleClick(EditSourceOnDoubleClickHandler.java:109)
 at com.intellij.util.EditSourceOnDoubleClickHandler$TreeMouseListener.mouseClicked(EditSourceOnDoubleClickHandler.java:104)
 at java.awt.AWTEventMulticaster.mouseClicked(AWTEventMulticaster.java:252)
 at java.awt.AWTEventMulticaster.mouseClicked(AWTEventMulticaster.java:252)
 at java.awt.AWTEventMulticaster.mouseClicked(AWTEventMulticaster.java:252)
 at java.awt.AWTEventMulticaster.mouseClicked(AWTEventMulticaster.java:252)
 at java.awt.Component.processMouseEvent(Component.java:6351)
 at javax.swing.JComponent.processMouseEvent(JComponent.java:3267)
 at com.intellij.ui.treeStructure.Tree.processMouseEvent(Tree.java:125)
 at com.intellij.ide.dnd.aware.DnDAwareTree.processMouseEvent(DnDAwareTree.java:36)
 at java.awt.Component.processEvent(Component.java:6113)
 at java.awt.Container.processEvent(Container.java:2085)
 at java.awt.Component.dispatchEventImpl(Component.java:4714)
 at java.awt.Container.dispatchEventImpl(Container.java:2143)
 at java.awt.Component.dispatchEvent(Component.java:4544)
 at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4618)
 at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4291)
 at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4212)
 at java.awt.Container.dispatchEventImpl(Container.java:2129)
 at java.awt.Window.dispatchEventImpl(Window.java:2475)
 at java.awt.Component.dispatchEvent(Component.java:4544)
 at java.awt.EventQueue.dispatchEvent(EventQueue.java:635)
 at com.intellij.ide.IdeEventQueue.f(IdeEventQueue.java:96)
 at com.intellij.ide.IdeEventQueue.b(IdeEventQueue.java:30)
 at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:209)
 at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:296)
 at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:211)
 at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:201)
 at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:196)
 at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:188)
 at java.awt.EventDispatchThread.run(EventDispatchThread.java:122)

0
Comment actions Permalink

Peter Niederwieser wrote:

Tried to shelve about 10 changed and added files, but got an error like "cannot find XXX.java.svn-base". Because I couldn't shelve the changes, I reverted them. But now all files that were reverted are shown in red font in the project view and editor tabs. How can I get back to normal? IDE restart, invalidate caches, reimport Maven project, full rebuild don't help.    

---
Original message URL: http://www.jetbrains.net/devnet/message/5249657#5249657

If they are listed as red, that usually means they are on your disk, but
not in subversion.  You can manually delete the files (or better, move
them to somewhere so you don't lose them)

HTH,
Daniel.

0

Please sign in to leave a comment.