Bug 321324

Description Daniel Schneller 2010-07-30 07:36:09 EDT

Following error occurred when merging a conflict. Local change: Modified Sources in a package. Remote incoming change: Package deleted.
Opened Resolve Tree Conflict dialog, chose "Apply remote changes" and set the "Mark as merged" checkbox.

Version:	0.7.8.I20091023-1300

SVN Client:	org.eclipse.team.svn.connector.svnkit16 2.2.1.I20091009-1900 SVN/1.6.2 SVNKit/1.3.0 (http://svnkit.com/) r5847

JVM Properties:
{java.vendor=Sun Microsystems Inc., org.eclipse.debug.ui.breakpoints.toggleFactoriesUsed=false, osgi.bundles.defaultStartLevel=4, sun.java.launcher=SUN_STANDARD, org.osgi.supports.framework.extension=true, sun.management.compiler=HotSpot Tiered Compilers, org.eclipse.jdt.debug.ui.debuggerActive=false, https.proxyHost=proxy.obi.de, eclipse.p2.profile=epp.package.rcp, https.proxySet=true, os.name=Windows XP, org.eclipse.jdt.debug.ui.supportsInstanceRetrieval=false, findbugs.home=/D:/eclipse351/plugins/edu.umd.cs.findbugs.plugin.eclipse_1.3.9.20090821/, osgi.ws=win32, sun.desktop=windows, java.vm.specification.vendor=Sun Microsystems Inc., java.runtime.version=1.6.0_20-b02, osgi.instance.area=file:/D:/ws35_funkmde_marktapp_trunk/, http.proxyPort=8080, user.name=schnelld, osgi.framework.extensions=reference:file:org.eclipse.equinox.transforms.hook_1.0.100.v20090520-1800.jar, eclipse.launcher=D:\eclipse351\eclipse.exe, org.eclipse.update.resolution_url=, org.osgi.framework.language=de, osgi.frameworkClassPath=., file:d:/eclipse351/plugins/org.eclipse.equinox.transforms.hook_1.0.100.v20090520-1800.jar, user.language=de, org.osgi.framework.processor=x86, osgi.syspath=d:\eclipse351\plugins, sun.boot.library.path=c:\jdk6\jre\bin, osgi.manifest.cache=D:\eclipse351\configuration\org.eclipse.osgi\manifests, org.eclipse.jdt.debug.ui.instanceof.IJavaStackFrame=false, java.version=1.6.0_20, org.osgi.framework.os.name=WindowsXP, user.timezone=Europe/Berlin, java.content.handler.pkgs=com.swtdesigner.content, sun.arch.data.model=32, http.nonProxyHosts=cvs-server.gfd.de|127.0.0.1|localhost, java.endorsed.dirs=c:\jdk6\jre\lib\endorsed, osgi.tracefile=D:\ws35_funkmde_marktapp_trunk\.metadata\trace.log, sun.cpu.isalist=pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86, sun.jnu.encoding=Cp1252, eclipse.application=org.eclipse.ui.ide.workbench, file.encoding.pkg=sun.io, org.osgi.framework.vendor=Eclipse, file.separator=\, java.specification.name=Java Platform API Specification, java.class.version=50.0, com.atlassian.connector.eclipse.branding.ui.isOnlyJiraInstalled=true, user.country=DE, org.eclipse.equinox.launcher.splash.location=d:\eclipse351\plugins\org.eclipse.platform_3.3.202.v201002111343\splash.bmp, java.home=c:\jdk6\jre, osgi.os=win32, eclipse.commands=-os win32 -ws win32 -arch x86 -showsplash -launcher D:\eclipse351\eclipse.exe -name Eclipse --launcher.library D:\eclipse351\plugins/org.eclipse.equinox.launcher.win32.win32.x86_1.0.200.v20090519\eclipse_1206.dll -startup D:\eclipse351\plugins/org.eclipse.equinox.launcher_1.0.201.R35x_v20090715.jar -exitdata b74_44 -product org.eclipse.epp.package.rcp.product -showlocation -clean -data D:\ws35_funkmde_marktapp_trunk -vm c:\jdk6\bin\javaw.exe , java.vm.info=mixed mode, osgi.splashLocation=d:\eclipse351\plugins\org.eclipse.platform_3.3.202.v201002111343\splash.bmp, os.version=5.1, https.proxyPort=8080, osgi.arch=x86, https.nonProxyHosts=cvs-server.gfd.de|127.0.0.1|localhost, path.separator=;, java.vm.version=16.3-b01, org.osgi.supports.framework.fragment=true, user.variant=, osgi.framework.shape=jar, http.proxySet=true, osgi.instance.area.default=file:/C:/Documents and Settings/schnelld/workspace/, java.awt.printerjob=sun.awt.windows.WPrinterJob, sun.io.unicode.encoding=UnicodeLittle, org.osgi.framework.version=1.5.0, awt.toolkit=sun.awt.windows.WToolkit, osgi.install.area=file:/D:/eclipse351/, osgi.framework=file:/d:/eclipse351/plugins/org.eclipse.osgi_3.5.2.R35x_v20100126.jar, user.home=C:\Documents and Settings\schnelld, org.eclipse.equinox.simpleconfigurator.configUrl=file:org.eclipse.equinox.simpleconfigurator/bundles.info, osgi.bundlestore=D:\eclipse351\configuration\org.eclipse.osgi\bundles, osgi.splashPath=platform:/base/plugins/org.eclipse.platform, osgi.nl=de_DE, java.specification.vendor=Sun Microsystems Inc., java.library.path=c:\jdk6\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Intel\DMIX;C:\Program Files\Graphviz2.22\bin;c:\program files\jprofiler5\bin\windows;d:\Program Files\WinSCP\;d:\Program Files\Support Tools\;D:\Program Files\QuickTime\QTSystem\;C:\Program Files\TortoiseSVN\bin;d:\Program Files\1Password;C:\Program Files\CVSNT;D:\apache-maven-3.0-alpha-6\bin;C:\Program Files\Common Files\Ahead\Lib\, java.vendor.url=http://java.sun.com/, org.osgi.framework.os.version=5.1.0, eclipse.startTime=1280246876090, eclipse.p2.data.area=@config.dir/../p2/, java.vm.vendor=Sun Microsystems Inc., java.runtime.name=Java(TM) SE Runtime Environment, java.class.path=D:\eclipse351\plugins/org.eclipse.equinox.launcher_1.0.201.R35x_v20090715.jar;lombok.jar, osgi.requiredJavaVersion=1.5, org.eclipse.update.reconcile=false, eclipse.vm=c:\jdk6\bin\javaw.exe, java.vm.specification.name=Java Virtual Machine Specification, org.eclipse.jdt.debug.ui.supportsForceReturn=false, java.vm.specification.version=1.0, sun.cpu.endian=little, sun.os.patch.level=Service Pack 3, java.io.tmpdir=d:\SCHNEL~1\LOCALS~1\temp\, java.vendor.url.bug=http://java.sun.com/cgi-bin/bugreport.cgi, http.proxyHost=proxy.obi.de, eclipse.product=org.eclipse.epp.package.rcp.product, eclipse.home.location=file:/D:/eclipse351/, os.arch=x86, java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment, java.ext.dirs=c:\jdk6\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext, user.dir=D:\eclipse351, org.osgi.supports.framework.requirebundle=true, osgi.clean=true, line.separator=
 , java.vm.name=Java HotSpot(TM) Server VM, org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog, javax.swing.adjustPopupLocationToFit=false, file.encoding=Cp1252, osgi.framework.version=3.5.2.R35x_v20100126, eclipse.buildId=, eclipse.vmargs=-server -javaagent:lombok.jar -Xbootclasspath/a:lombok.jar -Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx768m -XX:MaxPermSize=256m -jar D:\eclipse351\plugins/org.eclipse.equinox.launcher_1.0.201.R35x_v20090715.jar , java.specification.version=1.6, org.osgi.framework.executionenvironment=OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2,JRE-1.1,J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JavaSE-1.6, osgi.logfile=D:\ws35_funkmde_marktapp_trunk\.metadata\.log, osgi.configuration.area=file:/D:/eclipse351/configuration/}

java.lang.NullPointerException
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.action.AbstractSynchronizeLogicalModelAction$2$1.run(AbstractSynchronizeLogicalModelAction.java:339)
	at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(ModalContext.java:121)