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

Bug 491078

Summary:	Deleted files aren't shown in Synchronize view
Product:	[Technology] Subversive	Reporter:	Andrey Loskutov <loskutov>
Component:	Core	Assignee:	Alexander Gurov <a.gurov>
Status:	RESOLVED FIXED	QA Contact:
Severity:	critical
Priority:	P3	CC:	mauromol
Version:	4.0.0
Target Milestone:	4.6.0
Hardware:	All
OS:	All
See Also:	https://bugs.eclipse.org/bugs/show_bug.cgi?id=392750
Whiteboard:

Description Andrey Loskutov

2016-04-05 08:16:37 EDT

Looks like fix for bug 392750 introduced a regression (at least on my personal git repo which is a partial mirror of the trunk).

A deleted file is not shown anymore in the synchronize view.

git-svn-id: https://dev.eclipse.org/svnroot/technology/org.eclipse.subversive/trunk@21554

diff --git a/org.eclipse.team.svn.core/src/org/eclipse/team/svn/core/utility/FileUtility.java b/org.eclipse.team.svn.core/src/org/eclipse/team/svn/core/utility/FileUtility.java
index a804f30..a7d93d6 100644
--- a/org.eclipse.team.svn.core/src/org/eclipse/team/svn/core/utility/FileUtility.java
+++ b/org.eclipse.team.svn.core/src/org/eclipse/team/svn/core/utility/FileUtility.java
@@ -255,10 +255,12 @@
     }
     
     /*
-     * If the resource is a derived, team private or linked resource, it is ignored
+     * If the resource is inaccessible, the workspace root, a team private or a linked one, it should not be managed by SVN plug-in
      */
-    public static boolean isIgnored(IResource resource) {
-    	return resource.isDerived() || resource.isTeamPrivateMember() || FileUtility.isLinked(resource); 
+    public static boolean isNotSupervised(IResource resource) {
+    	return 
+    		resource instanceof IWorkspaceRoot || !resource.isAccessible() ||
+    		resource.isTeamPrivateMember() || FileUtility.isLinked(resource); 
     }

Here the comment and implementation (!resource.isAccessible()) seem to be wrong: this excludes all deleted files from SVN version control. As a result, I don't see any deleted files in the synchronize view. Removing !resource.isAccessible() condition or replacing it with resource.isDerived() fixes the regression.

Comment 1 Alexander Gurov

2016-04-08 11:46:00 EDT

Fixed. The build will be available on Monday.

Comment 2 Andrey Loskutov

2016-04-12 07:33:41 EDT

(In reply to Alexander Gurov from comment #1)
> Fixed. The build will be available on Monday.

Thanks, I've cherry-picked the commit and this seem to fix my problem.

Comment 3 Alexander Gurov

2016-04-25 04:41:22 EDT

(In reply to Andrey Loskutov from comment #2)
> Thanks, I've cherry-picked the commit and this seem to fix my problem.

There was one more important fix related to the commit dialog, I'm not sure if the corresponding issue affected your customers or not, just thought I'll mention it just in case:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=491153

Comment 4 Andrey Loskutov

2016-04-25 04:58:44 EDT

(In reply to Alexander Gurov from comment #3)
> (In reply to Andrey Loskutov from comment #2)
> > Thanks, I've cherry-picked the commit and this seem to fix my problem.
> 
> There was one more important fix related to the commit dialog, I'm not sure
> if the corresponding issue affected your customers or not, just thought I'll
> mention it just in case:
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=491153

Many thanks, I had luck to not include next commits to my branch!