Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > subclipse commit: rev 81 - trunk/subclipse/core/src/org/tigris/subversion/subclipse/core/resources

subclipse
Discussion topic

Back to topic list

subclipse commit: rev 81 - trunk/subclipse/core/src/org/tigris/subversion/subclipse/core/resources

Author cchab
Full name chabanois cédric
Date 2003-07-22 13:32:17 PDT
Message Author: cchab
Date: Tue Jul 22 15:32:15 2003
New Revision: 81

Modified:
   trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/SVNMoveD​eleteHook.java
Log:
force is set to true when calling SVNClientAdapter.move in moveFile method so that the rename (refactor) works when renaming a java class

Modified: trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/SVNMoveD​eleteHook.java
====================​====================​====================​==================
--- trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/SVNMoveD​eleteHook.java (original)
+++ trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/SVNMoveD​eleteHook.java Tue Jul 22 15:32:15 2003
@@ -112,7 +112,14 @@
 
             try {
                 OperationManager.get​Instance().beginOper​ation(svnClient);
- svnClient.move(sourc​e.getLocation().toFi​le(), destination.getLocat​ion().toFile());
+
+ // force is set to true because when we rename (refactor) a
+ // java class, the file is modified before being moved
+ // A modified file cannot be moved without force
+ svnClient.move(
+ source.getLocation().toFile(),
+ destination.getLocat​ion().toFile(),
+ true);
                 
                 // movedFile must be done before endOperation because
                 // destination file must not already exist in the workspace
@@ -161,7 +168,10 @@
 
             try {
                 OperationManager.get​Instance().beginOper​ation(svnClient);
- svnClient.move(sourc​e.getLocation().toFi​le(), destination.getLocat​ion().toFile());
+ svnClient.move(
+ source.getLocation().toFile(),
+ destination.getLocat​ion().toFile(),
+ true);
                 tree.movedFolderSubtree(source, destination);
             } catch (ClientException e) {
                 throw SVNException.wrapException(e);

--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@subc​lipse.tigris.org
For additional commands, e-mail: cvs-help at subclipse dot tigris dot org

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

Messages

Show all messages in topic

subclipse commit: rev 81 - trunk/subclipse/core/src/org/tigris/subversion/subclipse/core/resources cchab chabanois cédric 2003-07-22 13:32:17 PDT
Messages per page: