[Subclipse-users] NullPointerException with "Edit Conflicts" on non-SVN-mergable files

Hello,

I have a problem (NullPointerException) when executing "Edit Conflicts" in the Synchronize view on files which cannot be merged automatically by SVN. I am using Eclipse Helios with Subclipse 1.6.12.

The following steps reproduce the behaviour:
Share and commit a project with one file (e.g. foo.xml)
Set mime-type of the file to application/octet-stream to prevent SVN from merging
commit again
Import this project under a different name
Change foo.xml in both projects
Commit foo.xml in the first project
Update to HEAD in the second project
Open the Synchronize view and select "Edit Conflicts" in the context menu

An empty error dialog is displayed. When debugging Eclipse, I get the following stack trace:
Thread [ModalContext] (Suspended (exception NullPointerException))
        ConflictsCompareInput.prepareInput(IProgressMonitor) line: 142
        ConflictsCompareInput(CompareEditorInput).run(IProgressMonitor) line: 483
        ModalContext$ModalContextThread.run() line: 121

The error does not appear, if the mime-type is empty and the file can be merged automatically by SVN.

The problem seems to be that, foo.xml.mine is not created for files which cannot be merged automatically, but ConflictsCompareInput expects this file.

Any help would be appreciated.
Winfried

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2654461

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-09-02 14:34:02 CEST