[Winmerge-svn] SF.net SVN: winmerge: [4339] branches/R2_6/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <jt...@us...> - 2007-06-16 05:43:43
|
Revision: 4339 http://svn.sourceforge.net/winmerge/?rev=4339&view=rev Author: jtuc Date: 2007-06-15 22:43:41 -0700 (Fri, 15 Jun 2007) Log Message: ----------- Fix Bug #1723263 "Zip --> Both" Modified Paths: -------------- branches/R2_6/Src/7zCommon.cpp branches/R2_6/Src/Changes.txt Modified: branches/R2_6/Src/7zCommon.cpp =================================================================== --- branches/R2_6/Src/7zCommon.cpp 2007-06-16 05:19:58 UTC (rev 4338) +++ branches/R2_6/Src/7zCommon.cpp 2007-06-16 05:43:41 UTC (rev 4339) @@ -85,6 +85,7 @@ 2005/08/20 Jochen Tucht Option to guess archive format by signature Map extensions through ExternalArchiveFormat.ini 2005/08/23 Jochen Tucht Option to entirely disable 7-Zip integration +2007/06/16 Jochen Neubeck FIX [1723263] "Zip --> Both" operation... */ // RCS ID line follows -- this is updated by CVS @@ -928,6 +929,8 @@ di.getRightFilepath(pDoc->GetRightBasePath()) : di.getLeftFilepath(pDoc->GetLeftBasePath())); + UINT32 Recurse = item.Mask.Recurse; + if (m_nFlags & BalanceFolders) { if (m_bRight) @@ -945,6 +948,7 @@ envelope->FullPath = di.getLeftFilepath(pDoc->GetLeftBasePath()); implied = PVOID(2); // Don't enumerate same folder twice! isSideLeft = false; + Recurse = 0; } } } @@ -963,6 +967,7 @@ envelope->FullPath = di.getRightFilepath(pDoc->GetRightBasePath()); implied = PVOID(2); // Don't enumerate same folder twice! isSideRight = false; + Recurse = 0; } } } @@ -975,11 +980,12 @@ if (m_strFolderPrefix.GetLength()) { - envelope->Name.Insert(0, '\\'); + if (envelope->Name.GetLength()) + envelope->Name.Insert(0, '\\'); envelope->Name.Insert(0, m_strFolderPrefix); } - item.Mask.Item = item.Mask.Name|item.Mask.FullPath|item.Mask.CheckIfPresent|item.Mask.Recurse; + item.Mask.Item = item.Mask.Name|item.Mask.FullPath|item.Mask.CheckIfPresent|Recurse; item.Name = envelope->Name; item.FullPath = envelope->FullPath; return envelope; Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2007-06-16 05:19:58 UTC (rev 4338) +++ branches/R2_6/Src/Changes.txt 2007-06-16 05:43:41 UTC (rev 4339) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-06-16 Jochen + PATCH: [ 1734439 ] Fix Bug #1723263 "Zip --> Both" operation give unwanted content in output + Src: 7zCommon.cpp + 2007-06-14 Kimmo Bump ShellExtension version to 1.9.3 ShellExtension: ShellExtension.rc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |