Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 203054 Details for
Bug 357219
[Compatibility] Subversive "Edit conflicts" after merge gives NPE
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
Log snippet
log.snippet.txt (text/plain), 2.14 KB, created by
Thomas Kratz
on 2011-09-09 09:12:14 EDT
(
hide
)
Description:
Log snippet
Filename:
MIME Type:
Creator:
Thomas Kratz
Created:
2011-09-09 09:12:14 EDT
Size:
2.14 KB
patch
obsolete
>!MESSAGE SVN: '0x00400113: Show Conflict Editor' operation finished with error: null >!STACK 0 >java.lang.NullPointerException > at org.eclipse.compare.CompareEditorInput.setDirty(CompareEditorInput.java:1088) > at org.eclipse.team.svn.ui.compare.ConflictingFileEditorInput.prepareInput(ConflictingFileEditorInput.java:87) > at org.eclipse.compare.CompareEditorInput.run(CompareEditorInput.java:484) > at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation.openEclipseEditor(ShowConflictEditorOperation.java:158) > at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation.showEditorFor(ShowConflictEditorOperation.java:135) > at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation$1.run(ShowConflictEditorOperation.java:94) > at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doSubTask(ProgressMonitorUtility.java:118) > at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:154) > at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:149) > at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation.runImpl(ShowConflictEditorOperation.java:92) > at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:81) > at org.eclipse.team.svn.core.operation.LoggedOperation.run(LoggedOperation.java:39) > at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTask(ProgressMonitorUtility.java:104) > at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:90) > at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:81) > at org.eclipse.team.svn.ui.synchronize.FilteredSynchronizeModelOperation.run(FilteredSynchronizeModelOperation.java:40) > at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) > at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) > at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) > at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 357219
: 203054