Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [subversive-dev] New problems when using "Compare with branch..."

Le 02/11/2016 à 14:25, Alexander Gurov a écrit :
>> - is shown as an incoming deletion while it should not
>>   shown at all because there is no difference (this is bug [326694]
>>   but this time without common ancestry)
>> - is shown as an incoming deletion while it
>>   should be shown as an incoming change or a conflict

I found a way to improve these two use cases by setting
"IGNORE_ANCESTRY" option (cf. attached patch).
Both and are now shown as
incoming changes (instead of incoming deletion).

Florent Angebault
Linagora - Support OSSA
diff --git a/ b/
index a61cba5..2f40fe7 100644
--- a/
+++ b/
@@ -255,7 +255,7 @@ public class CompareResourcesInternalOperation extends AbstractActionOperation {
 				SVNEntryRevisionReference refPrev = new SVNEntryRevisionReference(FileUtility.getWorkingCopyPath(CompareResourcesInternalOperation.this.local.getResource()), null, SVNRevision.WORKING);
 				final SVNEntryRevisionReference refNext = SVNUtility.getEntryRevisionReference(CompareResourcesInternalOperation.this.remote);
 				// does not work with BASE working copy revision (not implemented yet exception)
-				proxy.diffStatusTwo(refPrev, refNext, SVNDepth.INFINITY, ISVNConnector.Options.NONE, null, new ISVNDiffStatusCallback() {
+				proxy.diffStatusTwo(refPrev, refNext, SVNDepth.INFINITY, ISVNConnector.Options.IGNORE_ANCESTRY, null, new ISVNDiffStatusCallback() {
 					public void next(SVNDiffStatus status) {
 						IPath tPath = new Path(status.pathPrev);
 						tPath = tPath.removeFirstSegments(rootPath.segmentCount());

Back to the top