AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commits are now allowed when a merge integration has occured even when no files are modified

Browse Source 
Support for forced merges
Context menus are offset by a pixel to prevent unintended clicks


FossilOrigin-Name: b0f81bc9c4d226d8406f65d9ad02099205d7e067
This commit is contained in:
kostas
2015-05-03 12:27:11 +00:00
parent cdba8c05f6
commit 894f980a7c
10 changed files with 84 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Fossil.h
View File

@@ -92,6 +92,8 @@ public:
void stopUI();
bool listFiles(QStringList &files);
bool status(QStringList& result);
bool diffFile(const QString &repoFile);
bool commitFiles(const QStringList &fileList, const QString &comment);
bool addFiles(const QStringList& fileList);
@@ -117,7 +119,7 @@ public:
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);
bool branchMerge(QStringList& res, const QString& revision, bool integrate, bool force, bool testOnly);
const QString &getCurrentRevision() const { return currentRevision; }
const QStringList &getCurrentTags() const { return currentTags; }