Login | Register
My pages Projects Community openCollabNet

Discussions > issues > [Issue 1191] New - NullPointerException with "Edit Conflicts" on non-SVN-mergable files

subclipse
Discussion topic

Back to topic list

[Issue 1191] New - NullPointerException with "Edit Conflicts" on non-SVN-mergable files

Author wdstenze
Full name Winfried Stenzel
Date 2010-09-07 06:01:12 PDT
Message http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=1191
                 Issue #|1191
                 Summary|NullPointerException with "Edit Conflicts" on non-SVN-
                        |mergable files
               Component|subclipse
                 Version|current
                Platform|All
              OS/Version|All
                     URL|
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|UI
             Assigned to|issues@subclipse
             Reported by|wdstenze






------- Additional comments from wdstenze at tigris dot org Tue Sep 7 06:01:11 -0700 2010 -------
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))
    ConflictsCompareInpu​​t.prepareInput(IPro​g​ressMonitor) line: 142
    ConflictsCompareInpu​​t(CompareEditorInpu​t​).run(IProgressMon​it​or) line: 483
    ModalContext$ModalC​​ontextThread.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.

« Previous message in topic | 1 of 2 | Next message in topic »

Messages

Show all messages in topic

[Issue 1191] New - NullPointerException with "Edit Conflicts" on non-SVN-mergable files wdstenze Winfried Stenzel 2010-09-07 06:01:12 PDT
     [Issue 1191] NullPointerException with "Edit Conflicts" on non-SVN-mergable files selsemore Stephen Elsemore 2010-09-07 11:48:57 PDT
Messages per page: