comparison kdiff3/src-QT4/directorymergewindow.cpp @ 96:9000a9763f6f

Fixed problem where destination directory would be renamed or deleted
during copy operation. Now if the destination directory exists only the
files inside will be copied.

 bool DirectoryMergeWindow::copyFLD( const QString& srcName, const QString& destName )
 {
    if ( srcName == destName )
       return true;
 
-   if ( FileAccess(destName, true).exists() )
+   FileAccess fi( srcName );
+   FileAccess faDest(destName, true);
+   if ( faDest.exists() && !( fi.isDir() && faDest.isDir() && (fi.isSymLink()==faDest.isSymLink())) )
    {
       bool bSuccess = deleteFLD( destName, m_pOptions->m_bDmCreateBakFiles );
       if ( !bSuccess )
       {
          m_pStatusInfo->addText(i18n("Error: copy( %1 -> %2 ) failed."
             "Deleting existing destination failed.",srcName,destName));
          return false;
       }
    }
 
-   FileAccess fi( srcName );
 
    if ( fi.isSymLink() && ((fi.isDir() && !m_bFollowDirLinks)  ||  (!fi.isDir() && !m_bFollowFileLinks)) )
    {
       m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )",srcName,destName));
 #if defined(_WIN32) || defined(Q_OS_OS2)

 #endif
    }
 
    if ( fi.isDir() )
    {
-      bool bSuccess = makeDir( destName );
-      return bSuccess;
+      if ( faDest.exists() )
+	 return true;
+      else
+      {
+         bool bSuccess = makeDir( destName );
+         return bSuccess;
+      }
    }
 
    int pos=destName.lastIndexOf('/');
    if ( pos>0 )
    {