Fix a bug when committing to two branches of the same repository in the same SVN revision

[svn-all-fast-export.git] / src / repository.h

diff --git a/src/repository.h b/src/repository.h
index d837599fcf53fc474126a42795e4447e36780a82..c5e70fe0b44276065c9ce99f9f482814ed7649ab 100644 (file)
--- a/src/repository.h
+++ b/src/repository.h
@@ -30,10 +30,6 @@ public:
     {
         Q_DISABLE_COPY(Transaction)
         friend class Repository;
-        struct FileProperties {
-            int mode;
-            int mark;
-        };
 
         Repository *repository;
         QByteArray branch;
@@ -42,10 +38,9 @@ public:
         QByteArray log;
         uint datetime;
         int revnum;
-        int lastmark;
 
         QStringList deletedFiles;
-        QHash<QString, FileProperties> modifiedFiles;
+        QByteArray modifiedFiles;
 
         inline Transaction() {}
     public:
@@ -77,6 +72,8 @@ private:
     QString name;
     QProcess fastImport;
     int commitCount;
+    int outstandingTransactions;
+    int lastmark;
     bool processHasStarted;
 
     void startFastImport();