Added merge support

FossilOrigin-Name: ac65fbf8d33a9e64fb97bd8652a43b4d11c8e538
2015-05-03 11:44:04 +00:00
parent f9eda348be
commit cdba8c05f6
10 changed files with 186 additions and 31 deletions
--- a/src/Fossil.h
+++ b/src/Fossil.h
@@ -116,6 +116,8 @@ public:
 	bool tagDelete(const QString& name, const QString& revision);

 	bool branchList(QStringList& branches, QStringList& activeBranches);
+	bool branchNew(const QString& name, const QString& revisionBasis, bool isPrivate=false);
+	bool branchMerge(QStringList& res, const QString& revision, bool integrate, bool testOnly);

 	const QString &getCurrentRevision() const { return currentRevision; }
 	const QStringList &getCurrentTags() const { return currentTags; }