Login | Register
My pages Projects Community openCollabNet

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

subclipse
Discussion topic

Back to topic list

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

Author selsemore
Full name Stephen Elsemore
Date 2016-01-29 11:19:40 PST
Message Author: selsemore
Date: 2016-01-29 11:19:40-0800
New Revision: 5961

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:
Do not update recursively from Synchronize 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​61&r1=5960&r​2=5961
====================​====================​====================​==================
--- 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-01-29 11:19:40-0800
@@ -34,6 +34,7 @@
 import org.tigris.subversio​n.subclipse.ui.Polic​y;
 import org.tigris.subversio​n.subclipse.ui.confl​icts.SVNConflictReso​lver;
 import org.tigris.subversio​n.svnclientadapter.S​VNRevision;
+import org.tigris.subversio​n.svnclientadapter.u​tils.Depth;
 
 public class OverrideAndUpdateSyn​chronizeOperation extends SVNSynchronizeOperation {
     private IResource[] modifiedResources;
@@ -87,6 +88,7 @@
             IResource[] incomingResources = getIncoming(resourceArray);
             SVNWorkspaceSubscrib​er.getInstance().upd​ateRemote(incomingRe​sources);
             UpdateResourcesCommand command = new UpdateResourcesComma​nd(provider.getSVNWo​rkspaceRoot(),incomi​ngResources, revision);
+ command.setDepth(Depth.empty);
             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=5961&r1=5​960&r2=5961
====================​====================​====================​==================
--- 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-01-29 11:19:40-0800
@@ -44,6 +44,7 @@
 import org.tigris.subversio​n.subclipse.ui.confl​icts.SVNConflictReso​lver;
 import org.tigris.subversio​n.svnclientadapter.S​VNRevision;
 import org.tigris.subversio​n.svnclientadapter.S​VNStatusKind;
+import org.tigris.subversio​n.svnclientadapter.u​tils.Depth;
 
 public class UpdateSynchronizeOperation extends SVNSynchronizeOperation {
     private IResource[] resources;
@@ -99,6 +100,7 @@
         try {
             SVNWorkspaceSubscrib​er.getInstance().upd​ateRemote(resourceAr​ray);
             UpdateResourcesCommand command = new UpdateResourcesComma​nd(provider.getSVNWo​rkspaceRoot(),resour​ceArray, revision);
+ command.setDepth(Depth.empty);
             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: r5961 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/subscriber selsemore Stephen Elsemore 2016-01-29 11:19:40 PST
Messages per page: