Bug 317787

Description Alexander Gurov 2010-06-24 04:54:50 EDT

Created attachment 172579 [details]
Real and 'fake' statuses

After merge all merged files are marked as "conflicting" in UI despite of real statuses. Now it so hard to merge branches when you have hundreds of changes... :(

Please compare the real statuses ('modifications' in the project navigator) and the Merge View statuses (screenshot attached).

Version:	0.7.9.I20100512-1900

SVN Client:	org.eclipse.team.svn.connector.svnkit16 2.2.2.I20100512-1900 SVN/1.6.6 SVNKit/1.3.2 (http://svnkit.com/) r6267

JVM Properties:
{java.runtime.name=Java(TM) SE Runtime Environment, java.runtime.version=1.6.0_18-b07, java.vendor=Sun Microsystems Inc., line.separator=
 , java.class.version=50.0, os.name=Windows XP, os.arch=x86, user.country=RU, os.version=5.1, eclipse.commands=-os win32 -ws win32 -arch x86 -showsplash C:\Eclipse_3.5\\plugins\org.eclipse.platform_3.3.202.v201002111343\splash.bmp -launcher C:\Eclipse_3.5\eclipse.exe -name Eclipse --launcher.library C:\Eclipse_3.5\plugins/org.eclipse.equinox.launcher.win32.win32.x86_1.0.200.v20090519\eclipse_1206.dll -startup C:\Eclipse_3.5\plugins/org.eclipse.equinox.launcher_1.0.201.R35x_v20090715.jar -product org.eclipse.epp.package.php.product -vm C:\Program Files\Java\jre6\bin\client\jvm.dll , java.version=1.6.0_18, osgi.framework.version=3.5.2.R35x_v20100126, file.separator=\, java.vm.info=mixed mode, sharing, path.separator=;, user.timezone=Europe/Helsinki, user.language=ru, java.vm.name=Java HotSpot(TM) Client VM, file.encoding=Cp1251}