1 // TortoiseSVN - a Windows shell extension for easy version control
\r
3 // Copyright (C) 2007-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 "svn_wc.h"
\r
21 #include "StandAloneDlg.h"
\r
24 * \ingroup TortoiseProc
\r
25 * Helper dialog used in merge callbacks to resolve conflicts.
\r
27 class CConflictResolveDlg : public CResizableStandAloneDialog
\r
29 DECLARE_DYNAMIC(CConflictResolveDlg)
\r
32 CConflictResolveDlg(CWnd* pParent = NULL); // standard constructor
\r
33 virtual ~CConflictResolveDlg();
\r
35 void SetConflictDescription(const svn_wc_conflict_description_t * description) {m_pConflictDescription = description;}
\r
36 svn_wc_conflict_choice_t GetResult() {return m_choice;}
\r
37 const CString& GetMergedFile() {return m_mergedfile;}
\r
38 bool IsCancelled() const {return m_bCancelled;}
\r
39 enum { IDD = IDD_CONFLICTRESOLVE };
\r
42 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
\r
43 virtual void OnCancel();
\r
44 virtual BOOL OnInitDialog();
\r
45 afx_msg void OnBnClickedUselocal();
\r
46 afx_msg void OnBnClickedUserepo();
\r
47 afx_msg void OnBnClickedEditconflict();
\r
48 afx_msg void OnBnClickedResolved();
\r
49 afx_msg void OnBnClickedResolvealllater();
\r
50 afx_msg void OnBnClickedHelp();
\r
51 afx_msg void OnBnClickedAbort();
\r
53 DECLARE_MESSAGE_MAP()
\r
56 const svn_wc_conflict_description_t * m_pConflictDescription;
\r
57 svn_wc_conflict_choice_t m_choice;
\r
58 CString m_mergedfile;
\r