### Eclipse Workspace Patch 1.0
#P org.eclipse.rse.services.local
Index: src/org/eclipse/rse/internal/services/local/files/LocalFileService.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java,v
retrieving revision 1.11
diff -u -r1.11 LocalFileService.java
--- src/org/eclipse/rse/internal/services/local/files/LocalFileService.java	4 Jul 2007 18:24:36 -0000	1.11
+++ src/org/eclipse/rse/internal/services/local/files/LocalFileService.java	12 Jul 2007 19:39:09 -0000
@@ -17,6 +17,7 @@
  * Kevin Doyle (IBM) - [182221] Throwing Proper Exceptions on create file/folder
  * Xuan Chen        (IBM)        - Fix 189487 - copy and paste a folder did not work - workbench hang
  * David McKnight   (IBM)        - [192705] Exception needs to be thrown when rename fails
+ * Kevin Doyle (IBM) - [196211] Move a folder to a directory that contains a folder by that name errors
  ********************************************************************************/
 
 package org.eclipse.rse.internal.services.local.files;
@@ -1045,30 +1046,30 @@
 
 	public boolean move(String srcParent, String srcName, String tgtParent, String tgtName, IProgressMonitor monitor) throws SystemMessageException 
 	{
-		File sourceFolderOrFile = new File(srcParent, srcName);
-		File targetFolder = new File(tgtParent, tgtName);
-		boolean sourceIsVirtual = ArchiveHandlerManager.isVirtual(sourceFolderOrFile.getAbsolutePath());
-		boolean targetIsVirtual = ArchiveHandlerManager.isVirtual(targetFolder.getAbsolutePath());
-		boolean targetIsArchive = ArchiveHandlerManager.getInstance().isArchive(targetFolder);
-		if (sourceIsVirtual || targetIsVirtual || targetIsArchive)
+//		File sourceFolderOrFile = new File(srcParent, srcName);
+//		File targetFolder = new File(tgtParent, tgtName);
+//		boolean sourceIsVirtual = ArchiveHandlerManager.isVirtual(sourceFolderOrFile.getAbsolutePath());
+//		boolean targetIsVirtual = ArchiveHandlerManager.isVirtual(targetFolder.getAbsolutePath());
+//		boolean targetIsArchive = ArchiveHandlerManager.getInstance().isArchive(targetFolder);
+//		if (sourceIsVirtual || targetIsVirtual || targetIsArchive)
 				/* DKM
 				 * we shouldn't be moving archives like virtuals
 				 *|| ArchiveHandlerManager.getInstance().isRegisteredArchive(newName)
 				 *
 				 */
-		{
+//		{
 			if (copy(srcParent, srcName, tgtParent, tgtName, monitor))
 			{
 				return delete(srcParent, srcName, monitor);
 			}
 			else return false;
-		}
-		else
-		{
-			File fileToMove = new File(srcParent, srcName);
-			File newFile = new File(tgtParent, tgtName);
-			return fileToMove.renameTo(newFile);
-		}
+//		}
+//		else
+//		{
+//			File fileToMove = new File(srcParent, srcName);
+//			File newFile = new File(tgtParent, tgtName);
+//			return fileToMove.renameTo(newFile);
+//		}
 	}