[Winmerge-svn] SF.net SVN: winmerge:[6410] trunk

[<ki...@us...>]

Revision: 6410
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6410&view=rev
Author:   kimmov
Date:     2009-02-04 00:15:24 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
BUG: [ 2556904 ] Can't copy files from right to left

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/DirActions.cpp

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2009-02-02 19:38:42 UTC (rev 6409)
+++ trunk/Docs/Users/ChangeLog.txt	2009-02-04 00:15:24 UTC (rev 6410)
@@ -3,6 +3,10 @@
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
+WinMerge 2.13.3
+  Bugfix: Could not copy files from right to left (#2556904)
+
+
 WinMerge 2.13.2 - 2009-01-28 (r6395)
   Register.bat should use Find with full path (#2536582)
   Bugfix: Creating new files caused message about missing files (#2515875)

Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp	2009-02-02 19:38:42 UTC (rev 6409)
+++ trunk/Src/DirActions.cpp	2009-02-04 00:15:24 UTC (rev 6410)
@@ -271,18 +271,18 @@
 			}
 
 			FileActionItem act;
-			String sDest(srFile);
+			String sDest(slFile);
 
 			if (GetDocument()->GetRecursive())
 			{
 				// If destination sides's relative path is empty it means we
 				// are copying unique items and need to get the real relative
 				// path from original side.
-				if (di.right.path.empty())
+				if (di.left.path.empty())
 				{
 					sDest = GetDocument()->GetRightBasePath();
-					sDest = paths_ConcatPath(sDest, di.left.path);
-					sDest = paths_ConcatPath(sDest, di.left.filename);
+					sDest = paths_ConcatPath(sDest, di.right.path);
+					sDest = paths_ConcatPath(sDest, di.right.filename);
 				}
 			}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.