From 2eae8f66a7afb926ed0de7d489748a776f03e9a0 Mon Sep 17 00:00:00 2001
From: Torgny Nyblom <kde@nyblom.org>
Date: Mon, 9 Aug 2010 13:31:49 +0200
Subject: If a branch is created from a previous commit that doesn't touch the
 branch from path then fallback to using the latest version and issue a
 warning

---
 src/repository.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/repository.h')

diff --git a/src/repository.h b/src/repository.h
index 629616b..d008996 100644
--- a/src/repository.h
+++ b/src/repository.h
@@ -42,6 +42,7 @@ public:
 
         QStringList deletedFiles;
         QByteArray modifiedFiles;
+        QVector<QString> modifiedPaths;
 
         inline Transaction() {}
     public:
@@ -85,8 +86,10 @@ private:
 
     QHash<QString, Branch> branches;
     QHash<QString, AnnotatedTag> annotatedTags;
+    // rXXXX, mark
     QHash<int, int> commitMarks;
-    QVector<int> exportedCommits;
+    // rXXXX, [path, path, ...]
+    QHash<int, QVector<QString> > exportedCommits;
     QString name;
     QProcess fastImport;
     int commitCount;
-- 
cgit v1.2.1