• set option 'allow multiple checkouts' ON
  
• in idea, check out and modify the file
  
• externally in VSS client check out, modify and commit the same file
  
• in idea, commit the file:
  ---> automatic merge is performed, the conflict markers are inserted to file. Edit the file to remove the markers and resolve the conflict.
  
• commit:
  ----> the dialog 'was the file properly merged?' is shown and cannot be closed. Exceptions are thrown.
  
  
  
  

from the log:

2008-02-29 12:11:16,352 [ 207578] ERROR - ellij.openapi.ui.DialogWrapper - Assertion failed: Access is allowed from event dispatch thread only
java.lang.Throwable
at com.intellij.openapi.diagnostic.Logger.assertTrue(Logger.java:89)
at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl.show(DialogWrapperPeerImpl.java:61)
at com.intellij.openapi.ui.DialogWrapper.show(DialogWrapper.java:813)
at com.intellij.openapi.ui.Messages.showDialog(Messages.java:83)
at com.intellij.openapi.ui.Messages.showYesNoDialog(Messages.java:147)
at com.intellij.vssSupport.commands.CheckinFileCommand$CheckinListener.showDialog(CheckinFileCommand.java:211)
at com.intellij.vssSupport.commands.CheckinFileCommand$CheckinListener.fileHasBeenProperlyMerged(CheckinFileCommand.java:196)
at com.intellij.vssSupport.commands.CheckinFileCommand$CheckinListener.onProperlyMerged(CheckinFileCommand.java:127)
at com.intellij.vssSupport.commands.CheckinFileCommand$CheckinListener.everythingFinishedImpl(CheckinFileCommand.java:79)
at com.intellij.vssSupport.commands.VSSExecUtil.runProcess(VSSExecUtil.java:128)
at com.intellij.vssSupport.commands.VssCommandAbstract.runProcess(VssCommandAbstract.java:92)
at com.intellij.vssSupport.commands.CheckinFileCommand.execute(CheckinFileCommand.java:46)
at com.intellij.vssSupport.VssVcs.checkinFile(VssVcs.java:260)
at com.intellij.vssSupport.Checkin.VssCheckinEnvironment.commitChanged(VssCheckinEnvironment.java:329)
at com.intellij.vssSupport.Checkin.VssCheckinEnvironment.commit(VssCheckinEnvironment.java:165)
at com.intellij.openapi.vcs.changes.ui.CommitHelper$4.process(CommitHelper.java:8)
at com.intellij.openapi.vcs.changes.ChangesUtil.processItemsByVcs(ChangesUtil.java:228)
at com.intellij.openapi.vcs.changes.ChangesUtil.processChangesByVcs(ChangesUtil.java:233)
at com.intellij.openapi.vcs.changes.ui.CommitHelper.b(CommitHelper.java:28)
at com.intellij.openapi.vcs.changes.ui.CommitHelper.access$000(CommitHelper.java:90)
at com.intellij.openapi.vcs.changes.ui.CommitHelper$2.run(CommitHelper.java:2)
at com.intellij.openapi.vcs.changes.ui.CommitHelper$1.run(CommitHelper.java:8)
at com.intellij.openapi.progress.impl.ProgressManagerImpl$5.run(ProgressManagerImpl.java:3)
at com.intellij.openapi.progress.impl.ProgressManagerImpl$2.run(ProgressManagerImpl.java:5)
at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:53)
at com.intellij.openapi.progress.impl.ProgressManagerImpl.runProcess(ProgressManagerImpl.java:35)
at com.intellij.openapi.progress.impl.ProgressManagerImpl$6.run(ProgressManagerImpl.java:5)
at com.intellij.openapi.application.impl.ApplicationImpl$5.run(ApplicationImpl.java:5)
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:3)
2008-02-29 12:11:16,352 [ 207578] ERROR - ellij.openapi.ui.DialogWrapper - IntelliJ IDEA (Selena) #7701 Build #7701
2008-02-29 12:11:16,352 [ 207578] ERROR - ellij.openapi.ui.DialogWrapper - JDK: 1.6.0_04
2008-02-29 12:11:16,352 [ 207578] ERROR - ellij.openapi.ui.DialogWrapper - VM: Java HotSpot(TM) Client VM
2008-02-29 12:11:16,352 [ 207578] ERROR - ellij.openapi.ui.DialogWrapper - Vendor: Sun Microsystems Inc.
2008-02-29 12:11:16,352 [ 207578] ERROR - ellij.openapi.ui.DialogWrapper - OS: Windows XP
2008-02-29 12:11:16,352 [ 207578] ERROR - ellij.openapi.ui.DialogWrapper - Last Action: ChangesView.Commit
2008-02-29 12:11:16,352 [ 207578] ERROR - pplication.impl.LaterInvocator - Assertion failed: enterModal() should be invoked in event-dispatch thread
java.lang.Throwable
at com.intellij.openapi.diagnostic.Logger.assertTrue(Logger.java:89)
at com.intellij.openapi.application.impl.LaterInvocator.enterModal(LaterInvocator.java:135)
at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl.show(DialogWrapperPeerImpl.java:74)
at com.intellij.openapi.ui.DialogWrapper.show(DialogWrapper.java:813)
at com.intellij.openapi.ui.Messages.showDialog(Messages.java:83)
at com.intellij.openapi.ui.Messages.showYesNoDialog(Messages.java:147)
at com.intellij.vssSupport.commands.CheckinFileCommand$CheckinListener.showDialog(CheckinFileCommand.java:211)
at com.intellij.vssSupport.commands.CheckinFileCommand$CheckinListener.fileHasBeenProperlyMerged(CheckinFileCommand.java:196)
at com.intellij.vssSupport.commands.CheckinFileCommand$CheckinListener.onProperlyMerged(CheckinFileCommand.java:127)
at com.intellij.vssSupport.commands.CheckinFileCommand$CheckinListener.everythingFinishedImpl(CheckinFileCommand.java:79)
at com.intellij.vssSupport.commands.VSSExecUtil.runProcess(VSSExecUtil.java:128)
at com.intellij.vssSupport.commands.VssCommandAbstract.runProcess(VssCommandAbstract.java:92)
at com.intellij.vssSupport.commands.CheckinFileCommand.execute(CheckinFileCommand.java:46)
at com.intellij.vssSupport.VssVcs.checkinFile(VssVcs.java:260)
at com.intellij.vssSupport.Checkin.VssCheckinEnvironment.commitChanged(VssCheckinEnvironment.java:329)
at com.intellij.vssSupport.Checkin.VssCheckinEnvironment.commit(VssCheckinEnvironment.java:165)
at com.intellij.openapi.vcs.changes.ui.CommitHelper$4.process(CommitHelper.java:8)
at com.intellij.openapi.vcs.changes.ChangesUtil.processItemsByVcs(ChangesUtil.java:228)
at com.intellij.openapi.vcs.changes.ChangesUtil.processChangesByVcs(ChangesUtil.java:233)
at com.intellij.openapi.vcs.changes.ui.CommitHelper.b(CommitHelper.java:28)
at com.intellij.openapi.vcs.changes.ui.CommitHelper.access$000(CommitHelper.java:90)
at com.intellij.openapi.vcs.changes.ui.CommitHelper$2.run(CommitHelper.java:2)
at com.intellij.openapi.vcs.changes.ui.CommitHelper$1.run(CommitHelper.java:8)
at com.intellij.openapi.progress.impl.ProgressManagerImpl$5.run(ProgressManagerImpl.java:3)
at com.intellij.openapi.progress.impl.ProgressManagerImpl$2.run(ProgressManagerImpl.java:5)
at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:53)
at com.intellij.openapi.progress.impl.ProgressManagerImpl.runProcess(ProgressManagerImpl.java:35)
at com.intellij.openapi.progress.impl.ProgressManagerImpl$6.run(ProgressManagerImpl.java:5)
at com.intellij.openapi.application.impl.ApplicationImpl$5.run(ApplicationImpl.java:5)
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:3)
2008-02-29 12:11:16,352 [ 207578] ERROR - pplication.impl.LaterInvocator - IntelliJ IDEA (Selena) #7701 Build #7701
2008-02-29 12:11:16,352 [ 207578] ERROR - pplication.impl.LaterInvocator - JDK: 1.6.0_04
2008-02-29 12:11:16,352 [ 207578] ERROR - pplication.impl.LaterInvocator - VM: Java HotSpot(TM) Client VM
2008-02-29 12:11:16,352 [ 207578] ERROR - pplication.impl.LaterInvocator - Vendor: Sun Microsystems Inc.
2008-02-29 12:11:16,352 [ 207578] ERROR - pplication.impl.LaterInvocator - OS: Windows XP
2008-02-29 12:11:16,352 [ 207578] ERROR - pplication.impl.LaterInvocator - Last Action: ChangesView.Commit


Issue was closed