Fix merge miss branch info

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / ExportDlg.h

diff --git a/src/TortoiseProc/ExportDlg.h b/src/TortoiseProc/ExportDlg.h
index 20622cf..8da3961 100644 (file)
--- a/src/TortoiseProc/ExportDlg.h
+++ b/src/TortoiseProc/ExportDlg.h
@@ -17,21 +17,21 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #pragma once\r
-#include "SVNRev.h"\r
+#include "afxwin.h"\r
+#include "GitRev.h"\r
 #include "StandAloneDlg.h"\r
 #include "HistoryCombo.h"\r
 #include "FileDropEdit.h"\r
 #include "LogDlg.h"\r
 #include "Tooltip.h"\r
-#include "afxwin.h"\r
-\r
+#include "ChooseVersion.h"\r
 \r
 /**\r
  * \ingroup TortoiseProc\r
  * Prompts the user for required information for an export command. The information\r
  * is the module name and the repository url. \r
  */\r
-class CExportDlg : public CResizableStandAloneDialog\r
+class CExportDlg : public CResizableStandAloneDialog, public CChooseVersion\r
 {\r
        DECLARE_DYNAMIC(CExportDlg)\r
 \r
@@ -58,7 +58,7 @@ protected:
        afx_msg void OnCbnSelchangeEolcombo();\r
        afx_msg void OnCbnEditchangeUrlcombo();\r
 \r
-       void            SetRevision(const SVNRev& rev);\r
+       void            SetRevision(const CString& rev);\r
 \r
        DECLARE_MESSAGE_MAP()\r
 protected:\r
@@ -68,16 +68,19 @@ protected:
        CString                 m_sExportDirOrig;\r
        bool                    m_bAutoCreateTargetName;\r
        CComboBox               m_depthCombo;\r
+\r
+       CHOOSE_EVENT_RADIO()    ;\r
+\r
 public:\r
        CHistoryCombo   m_URLCombo;\r
        CString                 m_URL;\r
        CString                 m_eolStyle;\r
-       SVNRev                  Revision;\r
+       CString                 m_Revision;\r
        BOOL                    m_bNoExternals;\r
        CButton                 m_butBrowse;\r
        CEdit                   m_editRevision;\r
        CString                 m_strExportDirectory;\r
        CFileDropEdit   m_cCheckoutEdit;\r
        CLogDlg *               m_pLogDlg;\r
-       svn_depth_t             m_depth;\r
+       //svn_depth_t           m_depth;\r
 };\r