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