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

Bug 326694

Summary: Compare with another branch shows files with no difference [SVN 1.7 or older]
Product: [Technology] Subversive Reporter: Ludovic WALLE <walle>
Component: CoreAssignee: Igor Burilo <igor.burilo>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: a.gurov, artur.kronenberg, christian.mueller, fangebault, h.huether, j.p.cranendonk, joachim.herb, jtk499, mauromol
Version: unspecified   
Target Milestone: 4.5.2   
Hardware: PC   
OS: Windows XP   
Whiteboard:

Description Ludovic WALLE CLA 2010-09-30 13:25:35 EDT
Build Identifier:  I20100608-0911

Right click on the project -> Compare With -> Branch..
shows a lot of files, most of them with no change, not even in whitespace or svn properties. This drives compare view (differential view) unusable. Only files with the same revision number are not shown. On those files, the file comparison part of the tag shows no difference, even with Ignore White Space option unchecked.


Reproducible: Always

Steps to Reproduce:
1. Create a project containing a file.
2. Share project using right click on the project -> Team -> Share project ...
3. Create a branch using right click on the project -> Team -> Branch ...
4. Create a new project from SVN using branch
5. Edit the same way the file in the two projects (after that, the pair of new files are identical again but different from the original pair)
6. Commit then update the two projects
7. Compare the first project with the branch using right click on the project -> Compare With -> Branch ... In the opened tab, the Structure Compare part shows the file, despite there is no difference. It is the same comparing the second project with trunk or using Compare With -> Revision or URL.
Comment 1 Mauro Molinari CLA 2012-08-29 04:20:00 EDT
I've also noticed this problem.
I'm using:
Subversive Team Provider 1.0.0.I20120803-1700
SVNKit 1.7.5_v1 implementation 3.0.0.I20120818-1700

The Structure Compare part is showing files with a red icon, just like they were in "conflict", however I think it doesn't make even sense to talk about "conflicts" in this case.
If you double click on any of these files, the double pane view shows that there are clearly no differences between them.

Please also see:
http://www.eclipse.org/forums/index.php/m/902815/
Comment 2 Christian Müller CLA 2012-08-29 17:16:27 EDT
Our development team face the same issue.
Comment 3 Jörg Thönnes CLA 2012-09-05 08:07:53 EDT
Alexander, are you aware of this issue?
Comment 4 Joachim Herb CLA 2014-07-25 11:11:58 EDT
Using Eclipse 4.4.0 (build id 20140612-0600), Subversion Client Adapter 1.10.1, Subversion JavaHL 1.8.9, SVN Team Provider Core 1.10.5, Subclipse 1.10.5, SVNKit Library 1.8.5.r10237_v20140319_1934 I can also reproduce this error.

I found the following workaround:
Open the "SVN Repository Exploring" perspective, select the branch you are working on, then "Compare ...", there the head of your trunk (or whatever). Then only the changed files are shown.

Using the command line client works also.
Comment 5 Alexander Gurov CLA 2015-12-27 16:31:26 EST
*** Bug 350570 has been marked as a duplicate of this bug. ***
Comment 6 Alexander Gurov CLA 2015-12-27 16:32:00 EST
*** Bug 400694 has been marked as a duplicate of this bug. ***
Comment 7 Alexander Gurov CLA 2015-12-27 16:36:34 EST
The functionality was implemented when there were no sufficient API support and the implementation made on those old API calls does not seem to be a good one. For SVN 1.8 clients there is a new implementation already that uses direct comparison between a working copy and an URL (see bug 484929). 
Now there is a need to solve the issue for the SVN 1.7.x based connectors (since we still support those).
Comment 8 Alexander Gurov CLA 2015-12-27 16:44:13 EST
Fixed. Though the SVN 1.7 API still have some limitations, there's a workaround. In some cases compare may take longer, but should have the same result as with it has using SVN 1.8 API.
Comment 9 Florent Angebault CLA 2016-02-10 12:07:32 EST
(In reply to Alexander Gurov from comment #8)
> Fixed. Though the SVN 1.7 API still have some limitations, there's a
> workaround. In some cases compare may take longer, but should have the same
> result as with it has using SVN 1.8 API.

I can still reproduce the issue using SVNKit 1.7 on both Luna and Mars.

Tested on Luna (4.4.2) with:
org.eclipse.team.svn (2.0.4.I20150123-1700) "Subversive SVN Team Provider"
org.polarion.eclipse.team.svn.connector (4.1.3.I20150214-1700) "Subversive SVN Connectors"
org.polarion.eclipse.team.svn.connector.svnkit17 (4.1.3.I20150214-1700) "Subversive SVN 1.7 SVN Kit Connector"

Tested on Mars (4.5.1) with:
org.eclipse.team.svn (3.0.4.I20160131-1700) "Subversive SVN Team Provider"
org.polarion.eclipse.team.svn.connector (5.0.2.I20151228-1700) "Subversive SVN Connectors"
org.polarion.eclipse.team.svn.connector.svnkit17 (5.0.0.I20150529-1700) "Subversive SVN 1.7 SVN Kit Connector"

Is the fix missing on update sites or did I do something wrong?
Comment 10 Alexander Gurov CLA 2016-02-11 06:27:03 EST
(In reply to Florent Angebault from comment #9)
> (In reply to Alexander Gurov from comment #8)
> > Fixed. Though the SVN 1.7 API still have some limitations, there's a
> > workaround. In some cases compare may take longer, but should have the same
> > result as with it has using SVN 1.8 API.
> 
> I can still reproduce the issue using SVNKit 1.7 on both Luna and Mars.
> 
> Tested on Luna (4.4.2) with:
> org.eclipse.team.svn (2.0.4.I20150123-1700) "Subversive SVN Team Provider"
> org.polarion.eclipse.team.svn.connector (4.1.3.I20150214-1700) "Subversive
> SVN Connectors"
> org.polarion.eclipse.team.svn.connector.svnkit17 (4.1.3.I20150214-1700)
> "Subversive SVN 1.7 SVN Kit Connector"

This is normal, since the version 2.0.4 does not include any related changes. And will not include in the future.

> Tested on Mars (4.5.1) with:
> org.eclipse.team.svn (3.0.4.I20160131-1700) "Subversive SVN Team Provider"
> org.polarion.eclipse.team.svn.connector (5.0.2.I20151228-1700) "Subversive
> SVN Connectors"
> org.polarion.eclipse.team.svn.connector.svnkit17 (5.0.0.I20150529-1700)
> "Subversive SVN 1.7 SVN Kit Connector"
> 
> Is the fix missing on update sites or did I do something wrong?

And this isn't. Although I can't reproduce it in my environment. I'll analyse how it works and try to find the issue within the algorithm, but can't really promise anything, because it works stable with the cases I tested it on and gives the same result as the 1.8 version.