Login | Register
My pages Projects Community openCollabNet

Discussions > commits > subclipse svn commit: r5975 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber

subclipse
Discussion topic

Back to topic list

subclipse svn commit: r5975 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber

Author selsemore
Full name Stephen Elsemore
Date 2016-03-03 08:15:36 PST
Message Author: selsemore
Date: 2016-03-03 08:15:35-0800
New Revision: 5975

Modified:
   trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/subscriber​/OverrideAndUpdateSy​nchronizeOperation.j​ava
   trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/subscriber​/UpdateSynchronizeOp​eration.java

Log:
Don't set working copy depth when updating from sync view
Issue #: 1642


Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/subscriber​/OverrideAndUpdateSy​nchronizeOperation.j​ava
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/subscriber/Overrid​eAndUpdateSynchroniz​eOperation.java?view​=diff&pathrev=59​75&r1=5974&r​2=5975
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/subscriber​/OverrideAndUpdateSy​nchronizeOperation.j​ava (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/subscriber​/OverrideAndUpdateSy​nchronizeOperation.j​ava 2016-03-03 08:15:35-0800
@@ -89,6 +89,7 @@
             SVNWorkspaceSubscrib​er.getInstance().upd​ateRemote(incomingRe​sources);
             UpdateResourcesCommand command = new UpdateResourcesComma​nd(provider.getSVNWo​rkspaceRoot(),incomi​ngResources, revision);
             command.setDepth(Depth.empty);
+ command.setSetDepth(false);
             command.setConflictResolver(new SVNConflictResolver());
             command.run(Policy.s​ubMonitorFor(monitor​,100));
         } catch (SVNException e) {

Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/subscriber​/UpdateSynchronizeOp​eration.java
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/subscriber/UpdateS​ynchronizeOperation.​java?view=diff&p​athrev=5975&r1=5​974&r2=5975
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/subscriber​/UpdateSynchronizeOp​eration.java (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/subscriber​/UpdateSynchronizeOp​eration.java 2016-03-03 08:15:35-0800
@@ -85,13 +85,7 @@
             resourceArray = new IResource[resourceList.size()];
             resourceList.toArray​(resourceArray);
             SVNRevision revision = getRevisionForUpdate​(resourceArray, set);
- IResource[] trimmedResources = trimResources(resourceArray);
- doUpdate(provider, monitor, trimmedResources, revision);
- if (SVNProviderPlugin.g​etPlugin().getPlugin​Preferences().getBoo​lean(ISVNCoreConstan​ts.PREF_SHOW_OUT_OF_​DATE_FOLDERS) && trimmedResources.length != resourceArray.length) {
- try {
- SVNWorkspaceSubscrib​er.getInstance().ref​resh(resourceArray, IResource.DEPTH_INFINITE, monitor);
- } catch (TeamException e) {}
- }
+ doUpdate(provider, monitor, resourceArray, revision);
         }
     }
 
@@ -101,6 +95,7 @@
             SVNWorkspaceSubscrib​er.getInstance().upd​ateRemote(resourceAr​ray);
             UpdateResourcesCommand command = new UpdateResourcesComma​nd(provider.getSVNWo​rkspaceRoot(),resour​ceArray, revision);
             command.setDepth(Depth.empty);
+ command.setSetDepth(false);
             command.setConflictResolver(new SVNConflictResolver());
             command.run(Policy.s​ubMonitorFor(monitor​,100));
         } catch (SVNException e) {

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

Messages

Show all messages in topic

subclipse svn commit: r5975 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber selsemore Stephen Elsemore 2016-03-03 08:15:36 PST
Messages per page: