From d384e5e6b54dad1cedb89f9a7aba8fdfeb096f97 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sun, 4 Jan 2009 16:20:32 +0800
Subject: [PATCH] Prepare release 0.2.0.0

---
 ext/scintilla/vcbuild/SciLexer.vcproj         |  8 +++----
 src/Changelog.txt                             | 31 +++++++++++++++++++++++++++
 src/TortoiseGitSetup/FeaturesFragment.wxi     |  5 +++--
 src/TortoiseGitSetup/StructureFragment.wxi    |  6 ++++--
 src/TortoiseGitSetup/VersionNumberInclude.wxi |  4 ++--
 src/TortoiseShell/ContextMenu.cpp             |  4 ++--
 src/version.h                                 | 10 ++++-----
 7 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/ext/scintilla/vcbuild/SciLexer.vcproj b/ext/scintilla/vcbuild/SciLexer.vcproj
index 49141ab..bb3678b 100644
--- a/ext/scintilla/vcbuild/SciLexer.vcproj
+++ b/ext/scintilla/vcbuild/SciLexer.vcproj
@@ -107,8 +107,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
-			IntermediateDirectory="..\..\obj\SciLexer\$(ConfigurationName)\"
+			OutputDirectory="..\..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\..\obj\SciLexer\$(ConfigurationName)\"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -2380,11 +2380,11 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\..\src\Git\ReadMe.txt"
+			RelativePath="ReadMe.txt"
 			>
 		</File>
 		<File
-			RelativePath="ReadMe.txt"
+			RelativePath="..\..\..\src\Git\ReadMe.txt"
 			>
 		</File>
 	</Files>
diff --git a/src/Changelog.txt b/src/Changelog.txt
index f99a0ce..21d67ce 100644
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -1,3 +1,34 @@
+version 0.2.0.0 preview version:
+Features:
+	1. Add TortoisgeMerge as default compare tools
+	2. Pull, Fetch, Push 
+	3. Create Branch\Tag
+	4. Switch branch \Chechout
+	5. Compare with previous version
+	6. Clone(only support local repository, see known issue for detail)
+	7. Log Dialog support filter
+	8. Check for modifications
+	9. Revert local change
+	10.Create Patch Serial
+	11.Apply Patch Serial
+	12.Add file to repository(see know issue)
+	13.Export to zip file
+
+Bug Fix:
+	1. A2W cause stack overwrite bug when git output is long. 
+
+	
+Known Issue:
+	1. ProcessDlg will wait for ever when clone remote repository(ssh, http,git).
+	2. push fetch and pull don't support password mode. Just support public key problem. 
+	3. Just fetch first 100 log item. 
+	4. If install TortoiseGit before MsysGit, you need modify register 
+	    HKEY_LOCAL_MACHINE\Software\TortoiseGit\\MsysGit\
+	   Let it point to correct msysgit install path.
+	5. Add File, please commit and show unversion file, the choose add file, then right clict, Choose Add file	 
+	6. To new initial repository, You will not see add file again in commit dialog box if give up commit when choose add
+	 
+
 version 0.1.0.0 preview version
 
 Features:
diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxi b/src/TortoiseGitSetup/FeaturesFragment.wxi
index 2d992d5..e4dce1f 100644
--- a/src/TortoiseGitSetup/FeaturesFragment.wxi
+++ b/src/TortoiseGitSetup/FeaturesFragment.wxi
@@ -12,9 +12,10 @@
 			<ComponentRef Id="C__TortoiseSVNShortcuts" />
 			<ComponentRef Id="C__TortoiseMerge" />
 			<ComponentRef Id="C__TortoiseMergeShortcuts" />
-<!--			
+			
       <ComponentRef Id="C__TortoiseBlame" />
-			<ComponentRef Id="C__TortoiseIDiff" />
+<!--		
+      <ComponentRef Id="C__TortoiseIDiff" />
 			<ComponentRef Id="C__TortoiseIDiffShortcuts" />
 -->
 			<ComponentRef Id="C__TortoiseUDiff" />
diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index b7194de..33ccef6 100644
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -302,12 +302,14 @@
               <File Id="F__soundwarning" ShortName="TWARN.WAV" Name="TortoiseSVN_Warning.wav" DiskId="1" Source="..\Resources\TortoiseSVN_Warning.wav" />
               <File Id="F__soundnotification" ShortName="TNOTIFY.WAV" Name="TortoiseSVN_Notification.wav" DiskId="1" Source="..\Resources\TortoiseSVN_Notification.wav" />
             </Component>
-<!--
+
             <Component Id="C__TortoiseBlame" Guid="$(var.GuidTortoiseBlame)" Win64="$(var.Win64YesNo)">
+              <!--
               <File Id="F__TortoiseBlame" ShortName="TBLAME.EXE" Name="TortoiseBlame.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseBlame.exe" KeyPath="yes" />
+             --> 
               <File Id="F__SciLexer" ShortName="SCILEX.DLL" Name="SciLexer.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\SciLexer.dll" />
            </Component>
---> 
+            
 <!--
             <Component Id="C__TortoiseIDiff" Guid="$(var.GuidTortoiseIDiff)" Win64="$(var.Win64YesNo)">
 
diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index 5772d1c..cb2e51a 100644
--- a/src/TortoiseGitSetup/VersionNumberInclude.wxi
+++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include Id="VersionNumberInclude">
 	<?define MajorVersion="0" ?>
-	<?define MinorVersion="1" ?>
-	<?define MicroVersion="1" ?>
+	<?define MinorVersion="2" ?>
+	<?define MicroVersion="0" ?>
 	<?define BuildVersion="0" ?>
 </Include>
diff --git a/src/TortoiseShell/ContextMenu.cpp b/src/TortoiseShell/ContextMenu.cpp
index 4cba80d..9736145 100644
--- a/src/TortoiseShell/ContextMenu.cpp
+++ b/src/TortoiseShell/ContextMenu.cpp
@@ -166,8 +166,8 @@ CShellExt::MenuInfo CShellExt::menuInfo[] =
 
 	{ ShellSeparator, 0, 0, 0, 0, 0, 0, 0, 0},
 
-	{ ShellMenuCherryPick,					MENUCHERRYPICK,		IDI_CREATEPATCH,		IDS_MENUCHERRYPICK,		IDS_MENUDESCCREATEPATCH,
-	ITEMIS_INSVN, ITEMIS_NORMAL, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },
+//	{ ShellMenuCherryPick,					MENUCHERRYPICK,		IDI_CREATEPATCH,		IDS_MENUCHERRYPICK,		IDS_MENUDESCCREATEPATCH,
+//	ITEMIS_INSVN, ITEMIS_NORMAL, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },
 
 	{ ShellMenuFormatPatch,					MENUFORMATPATCH,	IDI_CREATEPATCH,		IDS_MENUFORMATPATCH,		IDS_MENUDESCCREATEPATCH,
 	ITEMIS_INSVN, ITEMIS_NORMAL, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },
diff --git a/src/version.h b/src/version.h
index f1c0f5f..ad4f8be 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,10 +1,10 @@
-#define FILEVER        0,0,0,0
-#define PRODUCTVER     0,0,0,0
-#define STRFILEVER     "0, 0, 0, 0\0"
-#define STRPRODUCTVER  "0, 0, 0, 0\0"
+#define FILEVER        0,2,0,0
+#define PRODUCTVER     0,2,0,0
+#define STRFILEVER     "0, 2, 0, 0\0"
+#define STRPRODUCTVER  "0, 2, 0, 0\0"
 
 #define TSVN_VERMAJOR             0
-#define TSVN_VERMINOR             0
+#define TSVN_VERMINOR             2
 #define TSVN_VERMICRO             0
 #define TSVN_VERBUILD			  0
 #define TSVN_VERDATE			  "date unknown\n"
-- 
2.11.0