Login | Register
My pages Projects Community openCollabNet

Discussions > commits > subclipse svn commit: r5974 - trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subversion/subclipse/core/sync/SVNStatusSyncInfo.java

subclipse
Discussion topic

Back to topic list

subclipse svn commit: r5974 - trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subversion/subclipse/core/sync/SVNStatusSyncInfo.java

Author selsemore
Full name Stephen Elsemore
Date 2016-02-22 05:23:53 PST
Message Author: selsemore
Date: 2016-02-22 05:23:34-0800
New Revision: 5974

Modified:
   trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/sync/S​VNStatusSyncInfo.jav​a

Log:
Show children of incoming folder additions in sync view
Issue #: 1646


Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/sync/S​VNStatusSyncInfo.jav​a
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/org.tigris.s​ubversion.subclipse.​core/src/org/tigris/​subversion/subclipse​/core/sync/SVNStatus​SyncInfo.java?view=d​iff&pathrev=5974​&r1=5973&r2=​5974
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/sync/S​VNStatusSyncInfo.jav​a (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/sync/S​VNStatusSyncInfo.jav​a 2016-02-22 05:23:34-0800
@@ -138,11 +138,12 @@
         SVNStatusKind repositoryKind = (remoteStatusInfo != null)
                                             ? remoteStatusInfo.get​StatusKind() : SVNStatusKind.NORMAL;
         IResource local = getLocal();
-
- if (local.getParent() != null && !local.getParent().exists()) {
+
+ boolean filtered = !local.exists() && local.getLocation().​toFile().exists();
+ if (filtered) {
             return SyncInfo.IN_SYNC;
         }
-
+
         // If resource is ignored through Eclipse project's resource filters property, IResource.exists() returns false,
         // even if the file/folder exists in the file system. So we need to check for the existence in the file system
         // so that these items aren't incorrectly shown as outgoing deletions.

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

subclipse svn commit: r5974 - trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subversion/subclipse/core/sync/SVNStatusSyncInfo.java selsemore Stephen Elsemore 2016-02-22 05:23:53 PST
Messages per page: