Update diff del rename ignore document.
[TortoiseGit.git] / src / TortoiseProc / MergeWizardReintegrate.h
blob10ba2fefe2457c4898b93552b9f68af095edd64b
1 // TortoiseSVN - a Windows shell extension for easy version control
3 // Copyright (C) 2008 - TortoiseSVN
5 // This program is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU General Public License
7 // as published by the Free Software Foundation; either version 2
8 // of the License, or (at your option) any later version.
10 // This program is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 // GNU General Public License for more details.
15 // You should have received a copy of the GNU General Public License
16 // along with this program; if not, write to the Free Software Foundation,
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19 #pragma once
20 #include "MergeWizardBasePage.h"
21 #include "HistoryCombo.h"
22 #include "LogDlg.h"
24 /**
25 * Page in the merge wizard for selecting two urls and revisions for
26 * a tree merge.
28 class CMergeWizardReintegrate : public CMergeWizardBasePage
30 DECLARE_DYNAMIC(CMergeWizardReintegrate)
32 public:
33 CMergeWizardReintegrate();
34 virtual ~CMergeWizardReintegrate();
36 enum { IDD = IDD_MERGEWIZARD_REINTEGRATE };
38 protected:
39 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
40 virtual BOOL OnInitDialog();
41 virtual LRESULT OnWizardNext();
42 virtual LRESULT OnWizardBack();
43 virtual BOOL OnSetActive();
45 BOOL CheckData(bool bShowErrors = true);
47 afx_msg void OnBnClickedShowmergelog();
48 afx_msg void OnBnClickedBrowse();
51 DECLARE_MESSAGE_MAP()
53 CHistoryCombo m_URLCombo;
54 CLogDlg * m_pLogDlg;
55 CLogDlg * m_pLogDlg2;
57 public:
58 CString m_URL;
59 afx_msg void OnBnClickedShowlogwc();