aboutsummaryrefslogtreecommitdiffstats
path: root/src/repository.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/repository.h')
-rw-r--r--src/repository.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/repository.h b/src/repository.h
index 3df9d9a..020e1f6 100644
--- a/src/repository.h
+++ b/src/repository.h
@@ -40,6 +40,8 @@ public:
uint datetime;
int revnum;
+ QVector<int> merges;
+
QStringList deletedFiles;
QByteArray modifiedFiles;
@@ -52,6 +54,8 @@ public:
void setDateTime(uint dt);
void setLog(const QByteArray &log);
+ void noteCopyFromBranch (const QString &prevbranch, int revFrom);
+
void deleteFile(const QString &path);
QIODevice *addFile(const QString &path, int mode, qint64 length);
};