OSDN Git Service

Fix TortoiseGitBlame build problem and update version number and changelog
authorFrank Li <lznuaa@gmail.com>
Wed, 3 Jun 2009 14:15:27 +0000 (22:15 +0800)
committerFrank Li <lznuaa@gmail.com>
Wed, 3 Jun 2009 14:15:27 +0000 (22:15 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
doc/source/en/TortoiseGit/tsvn_preface.xml
src/Changelog.txt
src/TortoiseGitBlame/TortoiseGitBlame.vcproj
src/TortoiseGitBlame/stdafx.h
src/TortoiseGitSetup/VersionNumberInclude.wxi
src/version.h

index 91c3090..a03a41d 100644 (file)
                        Git project and explains the different approaches to version\r
                        control, and how Git works.\r
                </para>\r
+    <!--\r
                <para>\r
                        Even most Git users will never have to set up a server themselves.\r
                        The next chapter deals with how to set up such a server, and is useful\r
                        for administrators.\r
                </para>\r
+    -->\r
+    <!--\r
                <para>\r
                        The chapter on <xref linkend="tsvn-repository"/> explains how to set up\r
                        a local repository, which is useful for testing Git and TortoiseGit\r
                        using a single PC. It also explains a bit about repository administration\r
                        which is also relevant to repositories located on a server.\r
                </para>\r
+    -->\r
                <para>\r
                        The <xref linkend="tsvn-dug"/> is the most important section as\r
                        it explains all the main features of TortoiseGit and how to use them.\r
                        for scripting where you still need user interaction.\r
                </para>\r
                <para>\r
-                       The <xref linkend="tsvn-cli"/> give a correlation\r
-                       between TortoiseGit commands and their equivalents in the Git\r
-                       command line client <literal>svn.exe</literal>.\r
+                       The <xref linkend="git(1)"/> give git official document about\r
+                       command line client <literal>git.exe</literal>.\r
                </para>\r
        </sect1>\r
        <!-- =================================================================== -->\r
index a8f10ce..8afd885 100644 (file)
@@ -1,4 +1,26 @@
-Version 0.6.2.0 version(internal)\r
+version 0.7.1.0 (internal)\r
+Features:\r
+       *Add bug track plug-in support\r
+       Compatible with TortoiseSVN. The typical plug in is gurtl(google code issue plug-in).\r
+       http://code.google.com/p/gurtle/.\r
+       \r
+       *Support browse reference. \r
+       Show all branch, tags information. Support add remote, del branch\tag. \r
+\r
+       *Show merged file at log dialog. \r
+       \r
+       *Update version graphic tree. \r
+       Update graphic tree to qgit2.3\r
+       \r
+       *Add option -p for TortoisePLink. \r
+       -p is the same as -P. So it is compatible with OpenSSH port option. \r
+\r
+Fix:   *Fix Issue 91:  clone dialog generates bad directory name based on URL, ignores overrid\r
+       *Fix Issue 85:  Installer: warns of downgrade when running 0.6.2.0 on top of 0.6.1.0\r
+       *Fix i18n.logOutputEncoding doesn't work at log\commit dialog.\r
+\r
+\r
+Version 0.6.2.0 version(external)\r
         *Improve fetch overlay speed \r
         rebase igit.exe to msysgit 1.6.2.2, which is major application to get git status.  \r
 \r
index 896d331..eaa63dd 100644 (file)
                        IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)64"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
+                       UseOfATL="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\output_wnd.ico"\r
+                               RelativePath=".\res\output_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\output_wnd.ico"\r
+                               RelativePath="..\Resources\blameres\output_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
+                               RelativePath=".\res\output_wnd_hc.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\output_wnd_hc.ico"\r
+                               RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\properties_hc.bmp"\r
+                               RelativePath="..\Resources\blameres\properties_hc.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\properties_hc.bmp"\r
+                               RelativePath=".\res\properties_hc.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\properties_wnd.ico"\r
+                               RelativePath="..\Resources\blameres\properties_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\properties_wnd.ico"\r
+                               RelativePath=".\res\properties_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\Toolbar.bmp"\r
+                               RelativePath="..\Resources\blameres\Toolbar.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\Toolbar.bmp"\r
+                               RelativePath=".\res\Toolbar.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\Toolbar256.bmp"\r
+                               RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
+                               RelativePath=".\res\Toolbar256.bmp"\r
                                >\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
+                               RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
+                               RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
                                >\r
                        </File>\r
                        <File\r
index 16a9bf4..8cc55e8 100644 (file)
@@ -44,7 +44,8 @@
 #include <vector>\r
 #include <map>\r
 #include <fstream>\r
-\r
+#include <set>\r
+#include <algorithm>\r
 \r
 \r
 \r
index 586cc1c..2a591a6 100644 (file)
@@ -2,6 +2,6 @@
 <Include Id="VersionNumberInclude">\r
        <?define MajorVersion="0" ?>\r
        <?define MinorVersion="7" ?>\r
-       <?define MicroVersion="0" ?>\r
+       <?define MicroVersion="1" ?>\r
        <?define BuildVersion="0" ?>\r
 </Include>\r
index 3046274..b0394bb 100644 (file)
@@ -1,11 +1,11 @@
-#define FILEVER        0,6,2,0\r
-#define PRODUCTVER     0,6,2,0\r
-#define STRFILEVER     "0, 6, 2, 0\0"\r
-#define STRPRODUCTVER  "0, 6, 2, 0\0"\r
+#define FILEVER        0,7,1,0\r
+#define PRODUCTVER     0,7,1,0\r
+#define STRFILEVER     "0, 7, 1, 0\0"\r
+#define STRPRODUCTVER  "0, 7, 1, 0\0"\r
 \r
 #define TSVN_VERMAJOR             0\r
 #define TSVN_VERMINOR             6\r
-#define TSVN_VERMICRO             2\r
+#define TSVN_VERMICRO             1\r
 #define TSVN_VERBUILD                    0\r
 #define TSVN_VERDATE                     "date unknown\n"\r
 \r