[Winmerge-svn] SF.net SVN: winmerge:[6391] branches/R2_12
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2009-01-27 19:51:56
|
Revision: 6391 http://winmerge.svn.sourceforge.net/winmerge/?rev=6391&view=rev Author: kimmov Date: 2009-01-27 19:51:50 +0000 (Tue, 27 Jan 2009) Log Message: ----------- BUG: [ 2529517 ] Folder Compare:Copy Right/Left don't create folder structure Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/DirActions.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 19:47:40 UTC (rev 6390) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 19:51:50 UTC (rev 6391) @@ -23,6 +23,7 @@ Bugfix: Crashed if compared file disappeared during file compare (#2493945) Bugfix: Creating new files caused message about missing files (#2515875) Bugfix: Could not hide folders in recursive compare (#2528749) + Bugfix: Folder Compare:Copy Right/Left don't create folder Translation updates: - Brazilian (#2461443, #2524796) - Chinese Traditional (#2540115) Modified: branches/R2_12/Src/DirActions.cpp =================================================================== --- branches/R2_12/Src/DirActions.cpp 2009-01-27 19:47:40 UTC (rev 6390) +++ branches/R2_12/Src/DirActions.cpp 2009-01-27 19:51:50 UTC (rev 6391) @@ -271,8 +271,23 @@ } FileActionItem act; + String sDest(srFile); + + 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()) + { + sDest = GetDocument()->GetRightBasePath(); + sDest = paths_ConcatPath(sDest, di.left.path); + sDest = paths_ConcatPath(sDest, di.left.filename); + } + } + act.src = srFile; - act.dest = slFile; + act.dest = sDest; act.context = sel; act.dirflag = di.diffcode.isDirectory(); act.atype = actType; @@ -317,8 +332,23 @@ } FileActionItem act; + String sDest(srFile); + + 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()) + { + sDest = GetDocument()->GetRightBasePath(); + sDest = paths_ConcatPath(sDest, di.left.path); + sDest = paths_ConcatPath(sDest, di.left.filename); + } + } + act.src = slFile; - act.dest = srFile; + act.dest = sDest; act.dirflag = di.diffcode.isDirectory(); act.context = sel; act.atype = actType; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |