[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [Subclipse-dev] Re: subclipse svn commit: r5091 - trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subversion/subclipse/core/resources/SVNMoveDeleteHook.java

From: Stephen Elsemore <selsemore_at_collab.net>
Date: Mon, 22 Aug 2011 06:45:36 -0700

Eclipse doesn't have a problem if the resource has actually already been
deleted. But I suppose this approach could cause a problem if there is
some other move/delete hook in place that will get an error if it tries
to handle the delete and the resource is not there. The alternative
solution is to make sure our move/delete hook replicates everything that
the Eclipse delete does.

 

From: Mark Phippard [mailto:markphip_at_gmail.com]
Sent: Monday, August 22, 2011 6:36 AM
To: dev_at_subclipse.tigris.org
Subject: [Subclipse-dev] Re: subclipse svn commit: r5091 -
trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subv
ersion/subclipse/core/resources/SVNMoveDeleteHook.java

 

Drive by review ...

 

Is this the right thing to do? Doesn't SVN delete the actual
folder/file? Is this change only applying to some specific scenario?

 

 

On Mon, Aug 22, 2011 at 9:33 AM, <selsemore_at_tigris.org> wrote:

Author: selsemore
Date: 2011-08-22 06:33:24-0700
New Revision: 5091

Modified:
 
trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subv
ersion/subclipse/core/resources/SVNMoveDeleteHook.java

Log:
Move/delete hook should return false for deleteFile and deleteFolder
methods
(so that Eclipse will do its thing and do the actual delete after
Subclipse
is done).

Modified:
trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subv
ersion/subclipse/core/resources/SVNMoveDeleteHook.java
Url:
http://subclipse.tigris.org/source/browse/subclipse/trunk/subclipse/org.
tigris.subversion.subclipse.core/src/org/tigris/subversion/subclipse/cor
e/resources/SVNMoveDeleteHook.java?view=diff&pathrev=5091&r1=5090&r2=509
1
========================================================================
======

---
trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subv
ersion/subclipse/core/resources/SVNMoveDeleteHook.java      (original)
+++
trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subv
ersion/subclipse/core/resources/SVNMoveDeleteHook.java      2011-08-22
06:33:24-0700
@@ -74,15 +74,12 @@
            deletedFiles.add(file);
            deleteResource(resource);
-
-            tree.deletedFile(file);
-
        } catch (SVNException e) {
            tree.failed(e.getStatus());
        } finally {
            monitor.done();
        }
-        return true;
+        return false;
    }
@@ -113,8 +110,7 @@
        } finally {
            monitor.done();
        }
-        return true;
-
+        return false;
    }
    /*
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=3541&dsMessageId
=2827597
To unsubscribe from this discussion, please e-mail [unsubscribeURL]
 
-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=2827602
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_subclipse.tigris.org].
Received on 2011-08-22 15:45:41 CEST

This is an archived mail posted to the Subclipse Dev mailing list.