| Re: [subversive-dev] Weird behavior of the "Compare with branch" feature |
|
I committed all the discussed changes.
And they are correspondingly:
1) * SVN Kit 1.8 based connector gives a wrong path in diffStatus() (bug 484928) https://bugs.eclipse.org/bugs/show_bug.cgi?id=484928 I did not find any issues with your patch and used it as is. Thank you very much! :) 2) * Weird behavior of the "Compare with branch" feature (bug 484929) https://bugs.eclipse.org/bugs/show_bug.cgi?id=484929 I committed the SVN 1.8 API based version which is triggered in case if SVN 1.8 client is used. 3) * Compare with another branch shows files with no difference [SVN 1.7 or older] (bug 326694) https://bugs.eclipse.org/bugs/show_bug.cgi?id=326694 There were already a few related reports with the issues similar to the one you've described or seemingly different, but actually caused by the same code fragment. So, because we still support SVN 1.7, after some thinking I found a way to implement the same functionality using SVN 1.7 API, although it may work slower in case the working copy has many incoming changes (the working copy is not up to date). This code will be triggered only in case SVN 1.7 connector is used. All the fixes will be included into the Subversive version 3.0.3 which will be released shortly. 30.11.2015 12:45, fangebault+ml@xxxxxxxxxxxx пишет: Le 29/11/2015 09:31, Alexander Gurov a écrit :OK, I finally found out that your patch works as expected when using the JavaHL connector. With the SVNKit connector it only works as expected when the user selects the project's root directory for comparison. Otherwise, selecting any subfolder for comparison is still buggy. Do you have any hint on how to fix this?After checking the issue it do seems that: 1) SVN Kit 1.8.11 implements the functionality differently than JavaHL in regards to the paths reported. And it seems to be the SVN Kit's bug, since both libraries should implement SVN API the same way.I was able to fix paths with a hack (see attached patch). I haven't dug deeper yet because I'm still a noob with eclipse development. I hope you can do better.2) SVN Kit 1.7.14 does not provide support for working copy-to-URL comparison. So, the patch would not work with SVN Kit 1.7.14 at all. I can't check with JavaHL 1.7.x now since it's troublesome in my configuration, but I guess it'll be the same anyway, because the error message I've got said something like "diff summarize could be performed only on the URL-to-URL basis". So, I guess there is no choice but to make the code compatible with the SVN 1.8 only, since providing a wrong compare result is worse than providing nothing at all (on the other hand the functionality will completely stop working with SVN 1.7)?What I understand here is that trying to fix SVN connectors v1.7 would be tedious and probably risky. So I agree that we should only fix connectors v1.8. If possible, it would be a nice workaround to make subversive's "compare with..." popup print a warning when used with a connector v1.7 and point the user to a bug report and suggest to upgrade to v1.8.Also I suppose, the behaviour of SVN Kit connector could be adapted to its incorrect implementation, so that it won't seem different with JavaHL (though it does not mean the issue won't be reported to SVN Kit team).I'm not sure to understand what you mean here. Do you suggest to temporarily implement a workaround in SVNKit connector's code until the bug in SVNKit you mentionned above is fixed? If it is feasible then I think this is the best choice we have. As said above, I managed to fix paths but there are still some glitches: - some unmodified resources are still listed in the compare window (I'm still investigating on this) - resource decorations seem inappropriate: modified resources appear as incoming changes which is an arbitrary choice I guess. Maybe a bidirectional arrow would be more meaningful in this case. -- Best regards, Alexander Gurov, Subversive Team. |