summaryrefslogtreecommitdiffstats
path: root/vcs/subversion/svn_mergewidget.h
blob: db9056266d04d1580c4f402a06fbde3e3758bf90 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
/*
 *  Copyright (C) 2007 Dukju Ahn (dukjuahn@gmail.com)
 *
 *  This program is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU General Public
 *  License as published by the Free Software Foundation; either
 *  version 2 of the License, or (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  Library General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; see the file COPYING.LIB.  If not, write to
 *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 *  Boston, MA 02110-1301, USA.
 *
 */

#ifndef SVN_MERGEWIDGET_H
#define SVN_MERGEWIDGET_H

#include "svn_mergeoptiondlgbase.h"
namespace SvnGlobal
{
	class SvnRevision;
}

class KURL;

class SvnMergeDialog : public SvnMergeOptionDialogBase
{
	Q_OBJECT
public:
	SvnMergeDialog( const KURL &wcTarget, QWidget *parent = NULL );
	virtual ~SvnMergeDialog();

	KURL source1();
	SvnGlobal::SvnRevision rev1();
	KURL source2();
	SvnGlobal::SvnRevision rev2();
	bool recurse();
	bool force();
	bool ignoreAncestry();
	bool dryRun();
	
};

#endif