[Winmerge-svn] SF.net SVN: winmerge: [4785] branches/R2_6/Src

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

Revision: 4785
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4785&view=rev
Author:   kimmov
Date:     2007-11-21 14:03:31 -0800 (Wed, 21 Nov 2007)

Log Message:
-----------
BUG: [ 1828930 ] Copy Left To Right with VCS

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/FileActionScript.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2007-11-21 22:01:32 UTC (rev 4784)
+++ branches/R2_6/Src/Changes.txt	2007-11-21 22:03:31 UTC (rev 4785)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2007-11-21 Kimmo
+ BUG: [ 1828930 ] Copy Left To Right with VCS
+  Src: FileActionScript.cpp
+
 2007-11-21 Tim
  BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3
   Src: MainFrm.cpp

Modified: branches/R2_6/Src/FileActionScript.cpp
===================================================================
--- branches/R2_6/Src/FileActionScript.cpp	2007-11-21 22:01:32 UTC (rev 4784)
+++ branches/R2_6/Src/FileActionScript.cpp	2007-11-21 22:03:31 UTC (rev 4785)
@@ -143,7 +143,7 @@
 		const FileActionItem act = m_actions.GetNext(pos);
 		if (act.atype == FileAction::ACT_COPY && !act.dirflag)
 		{
-			int retVal = VCSCheckOut(act.src, bApplyToAll);
+			int retVal = VCSCheckOut(act.dest, bApplyToAll);
 			if (retVal == SCRIPT_USERCANCEL)
 				bContinue = FALSE;
 			else if (retVal == SCRIPT_USERSKIP)


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