From 883fc2dfc9adbe42f490b6049b4a1db62b843b71 Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Thu, 1 Jul 2010 18:26:26 +0530 Subject: Infer some copy sources as additional parents We use a literal meaning of multiple commit parents to allow us to infer some partial repository copying as merges. This helps us 1) track history despite some directory reorganization 2) link subset commits to parents 3) infer some merges which were achieved by overwriting a subtree with contents from another branch This seems to work well enough even with cvs2svn monster commits. The heuristics have been tuned by gut feel to work reasonably well with mono's SVN repository. They can definitely be improved. --- src/repository.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/repository.h') 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 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); }; -- cgit v1.2.1