Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 320846

Summary:	Resolve Tree Conflict - Accept incoming changes (del, del) throws NPE
Product:	[Technology] Subversive	Reporter:	Seva Lapsha <seva.lapsha>
Component:	Core	Assignee:	Igor Burilo <igor.burilo>
Status:	RESOLVED WORKSFORME	QA Contact:
Severity:	minor
Priority:	P3	CC:	ganoro
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Windows XP
Whiteboard:

Description Seva Lapsha

2010-07-25 09:28:11 EDT

Steps to reproduce:

1. Create del,del tree conflict on branches 1 and 2.
2. Merge from 2 to 1.
3. Resolve Tree Conflicts -> Accept Local changes.

Error occures:

SVN: '' operation finished with error
  Some of selected resources were not resolved.

No other impact - everything continues to work as expected.

Comment 1 Seva Lapsha

2010-07-25 09:29:56 EDT

Exception Trace:

java.lang.NullPointerException
at org.tmatesoft.svn.core.internal.wc.admin.SVNWCAccess$TCEntryHandler.handleEntry(SVNWCAccess.java:826)
at org.tmatesoft.svn.core.internal.wc.admin.SVNWCAccess.walkEntries(SVNWCAccess.java:716)
at org.tmatesoft.svn.core.wc.SVNWCClient.doResolve(SVNWCClient.java:2105)
at org.tmatesoft.svn.core.wc.SVNWCClient.doResolve(SVNWCClient.java:1989)
at org.tmatesoft.svn.core.wc.SVNWCClient.doResolve(SVNWCClient.java:1948)
at org.tmatesoft.svn.core.javahl.SVNClientImpl.resolve(SVNClientImpl.java:950)
at org.polarion.team.svn.connector.svnkit.SVNKitConnector.resolve(SVNKitConnector.java:490)
at org.eclipse.team.svn.core.extension.factory.ThreadNameModifier.resolve(ThreadNameModifier.java:498)
at org.eclipse.team.svn.core.operation.local.MarkResolvedOperation$1.run(MarkResolvedOperation.java:55)
at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doSubTask(ProgressMonitorUtility.java:118)
at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:146)
at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:141)
at org.eclipse.team.svn.core.operation.local.MarkResolvedOperation.runImpl(MarkResolvedOperation.java:53)
at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:77)
at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTask(ProgressMonitorUtility.java:104)
at org.eclipse.team.svn.core.operation.CompositeOperation.runImpl(CompositeOperation.java:94)
at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:77)
at org.eclipse.team.svn.core.operation.LoggedOperation.run(LoggedOperation.java:38)
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:55)

Comment 2 Alexander Gurov

2011-03-19 04:25:52 EDT

Does not happen in the latest versions of the plug-in.

Comment 3 Alexander Gurov

2011-03-19 04:28:24 EDT

Actually there is no involvement of the client library code now, so the SVN Kit library probably have the same issue even now, but it shouldn't affect Subversive anymore.