Prepare release 0.2.0.0

diff --git a/ext/scintilla/vcbuild/SciLexer.vcproj b/ext/scintilla/vcbuild/SciLexer.vcproj
index 49141ab..bb3678b 100644 (file)
--- a/ext/scintilla/vcbuild/SciLexer.vcproj
+++ b/ext/scintilla/vcbuild/SciLexer.vcproj
@@ -107,8 +107,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\SciLexer\$(ConfigurationName)\"\r
+                       OutputDirectory="..\..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\..\obj\SciLexer\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
@@ -2380,11 +2380,11 @@
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
+                       RelativePath="ReadMe.txt"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath="ReadMe.txt"\r
+                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
                        >\r
                </File>\r
        </Files>\r

diff --git a/src/Changelog.txt b/src/Changelog.txt
index f99a0ce..21d67ce 100644 (file)
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -1,3 +1,34 @@
+version 0.2.0.0 preview version:\r
+Features:\r
+       1. Add TortoisgeMerge as default compare tools\r
+       2. Pull, Fetch, Push \r
+       3. Create Branch\Tag\r
+       4. Switch branch \Chechout\r
+       5. Compare with previous version\r
+       6. Clone(only support local repository, see known issue for detail)\r
+       7. Log Dialog support filter\r
+       8. Check for modifications\r
+       9. Revert local change\r
+       10.Create Patch Serial\r
+       11.Apply Patch Serial\r
+       12.Add file to repository(see know issue)\r
+       13.Export to zip file\r
+\r
+Bug Fix:\r
+       1. A2W cause stack overwrite bug when git output is long. \r
+\r
+       \r
+Known Issue:\r
+       1. ProcessDlg will wait for ever when clone remote repository(ssh, http,git).\r
+       2. push fetch and pull don't support password mode. Just support public key problem. \r
+       3. Just fetch first 100 log item. \r
+       4. If install TortoiseGit before MsysGit, you need modify register \r
+           HKEY_LOCAL_MACHINE\Software\TortoiseGit\\MsysGit\\r
+          Let it point to correct msysgit install path.\r
+       5. Add File, please commit and show unversion file, the choose add file, then right clict, Choose Add file       \r
+       6. To new initial repository, You will not see add file again in commit dialog box if give up commit when choose add\r
+        \r
+\r
 version 0.1.0.0 preview version\r
 \r
 Features:\r

diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxi b/src/TortoiseGitSetup/FeaturesFragment.wxi
index 2d992d5..e4dce1f 100644 (file)
--- a/src/TortoiseGitSetup/FeaturesFragment.wxi
+++ b/src/TortoiseGitSetup/FeaturesFragment.wxi
@@ -12,9 +12,10 @@
                        <ComponentRef Id="C__TortoiseSVNShortcuts" />\r
                        <ComponentRef Id="C__TortoiseMerge" />\r
                        <ComponentRef Id="C__TortoiseMergeShortcuts" />\r
-<!--                   \r
+                       \r
       <ComponentRef Id="C__TortoiseBlame" />\r
-                       <ComponentRef Id="C__TortoiseIDiff" />\r
+<!--           \r
+      <ComponentRef Id="C__TortoiseIDiff" />\r
                        <ComponentRef Id="C__TortoiseIDiffShortcuts" />\r
 -->\r
                        <ComponentRef Id="C__TortoiseUDiff" />\r

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index b7194de..33ccef6 100644 (file)
--- 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" />\r
               <File Id="F__soundnotification" ShortName="TNOTIFY.WAV" Name="TortoiseSVN_Notification.wav" DiskId="1" Source="..\Resources\TortoiseSVN_Notification.wav" />\r
             </Component>\r
-<!--\r
+\r
             <Component Id="C__TortoiseBlame" Guid="$(var.GuidTortoiseBlame)" Win64="$(var.Win64YesNo)">\r
+              <!--\r
               <File Id="F__TortoiseBlame" ShortName="TBLAME.EXE" Name="TortoiseBlame.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseBlame.exe" KeyPath="yes" />\r
+             --> \r
               <File Id="F__SciLexer" ShortName="SCILEX.DLL" Name="SciLexer.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\SciLexer.dll" />\r
            </Component>\r
---> \r
+            \r
 <!--\r
             <Component Id="C__TortoiseIDiff" Guid="$(var.GuidTortoiseIDiff)" Win64="$(var.Win64YesNo)">\r
 \r

diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index 5772d1c..cb2e51a 100644 (file)
--- a/src/TortoiseGitSetup/VersionNumberInclude.wxi
+++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Include Id="VersionNumberInclude">\r
        <?define MajorVersion="0" ?>\r
-       <?define MinorVersion="1" ?>\r
-       <?define MicroVersion="1" ?>\r
+       <?define MinorVersion="2" ?>\r
+       <?define MicroVersion="0" ?>\r
        <?define BuildVersion="0" ?>\r
 </Include>\r

diff --git a/src/TortoiseShell/ContextMenu.cpp b/src/TortoiseShell/ContextMenu.cpp
index 4cba80d..9736145 100644 (file)
--- a/src/TortoiseShell/ContextMenu.cpp
+++ b/src/TortoiseShell/ContextMenu.cpp
@@ -166,8 +166,8 @@ CShellExt::MenuInfo CShellExt::menuInfo[] =
 \r
        { ShellSeparator, 0, 0, 0, 0, 0, 0, 0, 0},\r
 \r
-       { ShellMenuCherryPick,                                  MENUCHERRYPICK,         IDI_CREATEPATCH,                IDS_MENUCHERRYPICK,             IDS_MENUDESCCREATEPATCH,\r
-       ITEMIS_INSVN, ITEMIS_NORMAL, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
+//     { ShellMenuCherryPick,                                  MENUCHERRYPICK,         IDI_CREATEPATCH,                IDS_MENUCHERRYPICK,             IDS_MENUDESCCREATEPATCH,\r
+//     ITEMIS_INSVN, ITEMIS_NORMAL, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
 \r
        { ShellMenuFormatPatch,                                 MENUFORMATPATCH,        IDI_CREATEPATCH,                IDS_MENUFORMATPATCH,            IDS_MENUDESCCREATEPATCH,\r
        ITEMIS_INSVN, ITEMIS_NORMAL, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r

diff --git a/src/version.h b/src/version.h
index f1c0f5f..ad4f8be 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,10 +1,10 @@
-#define FILEVER        0,0,0,0\r
-#define PRODUCTVER     0,0,0,0\r
-#define STRFILEVER     "0, 0, 0, 0\0"\r
-#define STRPRODUCTVER  "0, 0, 0, 0\0"\r
+#define FILEVER        0,2,0,0\r
+#define PRODUCTVER     0,2,0,0\r
+#define STRFILEVER     "0, 2, 0, 0\0"\r
+#define STRPRODUCTVER  "0, 2, 0, 0\0"\r
 \r
 #define TSVN_VERMAJOR             0\r
-#define TSVN_VERMINOR             0\r
+#define TSVN_VERMINOR             2\r
 #define TSVN_VERMICRO             0\r
 #define TSVN_VERBUILD                    0\r
 #define TSVN_VERDATE                     "date unknown\n"\r