diff options
author | Torgny Nyblom <kde@nyblom.org> | 2010-08-09 13:31:49 +0200 |
---|---|---|
committer | Torgny Nyblom <kde@nyblom.org> | 2010-08-09 13:31:49 +0200 |
commit | 2eae8f66a7afb926ed0de7d489748a776f03e9a0 (patch) | |
tree | 4b9ea70632ee091b9dfd4c4213341d3e2de50ce2 /src/repository.h | |
parent | f48dc1eb2a2c3f79561104fa2e571443263d3da6 (diff) | |
download | svn2git-2eae8f66a7afb926ed0de7d489748a776f03e9a0.tar svn2git-2eae8f66a7afb926ed0de7d489748a776f03e9a0.tar.gz svn2git-2eae8f66a7afb926ed0de7d489748a776f03e9a0.tar.bz2 svn2git-2eae8f66a7afb926ed0de7d489748a776f03e9a0.tar.xz svn2git-2eae8f66a7afb926ed0de7d489748a776f03e9a0.zip |
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
Diffstat (limited to 'src/repository.h')
-rw-r--r-- | src/repository.h | 5 |
1 files changed, 4 insertions, 1 deletions
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; |