Merge branch 'roll_back'

diff --git a/ext/igit.exe b/ext/gitexe/igit.exe
similarity index 100%
rename from ext/igit.exe
rename to ext/gitexe/igit.exe

diff --git a/ext/gitexe/libiconv2.dll b/ext/gitexe/libiconv2.dll
new file mode 100644 (file)
index 0000000..17da219
Binary files /dev/null and b/ext/gitexe/libiconv2.dll differ

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 7088bc5..3c4b9fc 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TGitCache/CachedDirectory.cpp b/src/TGitCache/CachedDirectory.cpp
index 2b2cb3b..6460789 100644 (file)
--- a/src/TGitCache/CachedDirectory.cpp
+++ b/src/TGitCache/CachedDirectory.cpp
@@ -853,11 +853,13 @@ git_wc_status_kind CCachedDirectory::CalculateRecursiveStatus()
        // Combine our OWN folder status with the most important of our *FILES'* status.\r
        git_wc_status_kind retVal = GitStatus::GetMoreImportant(m_mostImportantFileStatus, m_ownStatus.GetEffectiveStatus());\r
 \r
-       if ((retVal != git_wc_status_modified)&&(retVal != m_ownStatus.GetEffectiveStatus()))\r
+       // NOTE: TSVN marks dir as modified if it contains added/deleted/missing files, but we prefer the most important\r
+       //       status to propagate upward in its original state\r
+       /*if ((retVal != git_wc_status_modified)&&(retVal != m_ownStatus.GetEffectiveStatus()))\r
        {\r
                if ((retVal == git_wc_status_added)||(retVal == git_wc_status_deleted)||(retVal == git_wc_status_missing))\r
                        retVal = git_wc_status_modified;\r
-       }\r
+       }*/\r
 \r
        // Now combine all our child-directorie's status\r
        \r
@@ -866,11 +868,11 @@ git_wc_status_kind CCachedDirectory::CalculateRecursiveStatus()
        for(it = m_childDirectories.begin(); it != m_childDirectories.end(); ++it)\r
        {\r
                retVal = GitStatus::GetMoreImportant(retVal, it->second);\r
-               if ((retVal != git_wc_status_modified)&&(retVal != m_ownStatus.GetEffectiveStatus()))\r
+               /*if ((retVal != git_wc_status_modified)&&(retVal != m_ownStatus.GetEffectiveStatus()))\r
                {\r
                        if ((retVal == git_wc_status_added)||(retVal == git_wc_status_deleted)||(retVal == git_wc_status_missing))\r
                                retVal = git_wc_status_modified;\r
-               }\r
+               }*/\r
        }\r
        \r
        return retVal;\r

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 3a173e6..2b8e3d0 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -231,7 +231,8 @@ out everything for now, leaving these enabled as they are would make the install
             </Component>\r
 \r
             <Component Id="C__wingit" Guid="$(var.GuidGitLib)" Win64="$(var.Win64YesNo)">\r
-              <File Id="F__wingit" ShortName="IGIT.EXE" Name="igit.exe" DiskId="1" Source="..\..\ext\igit.exe" KeyPath="yes" />\r
+              <File Id="F__wingit" ShortName="IGIT.EXE" Name="igit.exe" DiskId="1" Source="..\..\ext\gitexe\igit.exe" KeyPath="yes" />\r
+                         <File Id="F__libiconv2" ShortName="LIBICONV.DLL" Name="libiconv2.dll" DiskId="1" Source="..\..\ext\gitexe\libiconv2.dll" />\r
             </Component>\r
             \r
             <Component Id="C__TortoiseSVN" Guid="$(var.GuidTortoiseSVN)" Win64="$(var.Win64YesNo)">\r

diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index ff8e0b7..fac9f6e 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="3" ?>\r
-       <?define MicroVersion="3" ?>\r
+       <?define MinorVersion="4" ?>\r
+       <?define MicroVersion="0" ?>\r
        <?define BuildVersion="0" ?>\r
 </Include>\r

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index aaf008a..2839f2e 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -1019,6 +1019,7 @@ int CRebaseDlg::RebaseThread()
                                break;\r
                        }\r
                        m_RebaseStage = REBASE_CONTINUE;\r
+                       continue;\r
 \r
                }else if( m_RebaseStage == REBASE_CONTINUE )\r
                {\r