Login | Register
My pages Projects Community openCollabNet

Discussions > commits > subclipse svn commit: r5962 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/util/ResourceSelectionTree.java

subclipse
Discussion topic

Back to topic list

subclipse svn commit: r5962 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/util/ResourceSelectionTree.java

Author selsemore
Full name Stephen Elsemore
Date 2016-02-04 04:45:27 PST
Message Author: selsemore
Date: 2016-02-04 04:45:27-0800
New Revision: 5962

Modified:
   trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/util/Resou​rceSelectionTree.jav​a

Log:
Fix recursive revert of deleted folders from explorer views
Issue #: 1643


Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/util/Resou​rceSelectionTree.jav​a
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/org.tigris.s​ubversion.subclipse.​ui/src/org/tigris/su​bversion/subclipse/u​i/util/ResourceSelec​tionTree.java?view=d​iff&pathrev=5962​&r1=5961&r2=​5962
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/util/Resou​rceSelectionTree.jav​a (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/util/Resou​rceSelectionTree.jav​a 2016-02-04 04:45:27-0800
@@ -863,7 +863,16 @@
         List<String> locations = new ArrayList<String>();
         List<IResource> uniqueResources = new ArrayList<IResource>();
         for (IResource resource : resources) {
- if (resource.getParent() == null || resource.getParent().exists()) {
+ boolean parentDeleted = false;
+ if (resource.getParent() != null && !resource.getParent().exists()) {
+ ISVNLocalResource svnResource = SVNWorkspaceRoot.get​SVNResourceFor(resou​rce.getParent());
+ try {
+ if (svnResource != null && svnResource.getStatu​s().isDeleted()) {
+ parentDeleted = true;
+ }
+ } catch (SVNException e) {}
+ }
+ if (parentDeleted || resource.getParent() == null || resource.getParent().exists()) {
                 if (resource.getLocation() == null || !locations.contains(​resource.getLocation​().toString())) {
                     uniqueResources.add(resource);
                     locations.add(resour​ce.getLocation().toS​tring());

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

Messages

Show all messages in topic

subclipse svn commit: r5962 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/util/ResourceSelectionTree.java selsemore Stephen Elsemore 2016-02-04 04:45:27 PST
Messages per page: