diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2010-07-01 23:35:38 +0530 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2010-07-01 23:35:38 +0530 |
| commit | b8ad70ccbf75cb25985b0e810be1e2c794b42c12 (patch) | |
| tree | ff8bb3920e84d0461153dc21e129c52bbd2c2d72 | |
| parent | 883fc2dfc9adbe42f490b6049b4a1db62b843b71 (diff) | |
| download | svn2git-b8ad70ccbf75cb25985b0e810be1e2c794b42c12.tar svn2git-b8ad70ccbf75cb25985b0e810be1e2c794b42c12.tar.gz svn2git-b8ad70ccbf75cb25985b0e810be1e2c794b42c12.tar.bz2 svn2git-b8ad70ccbf75cb25985b0e810be1e2c794b42c12.tar.xz svn2git-b8ad70ccbf75cb25985b0e810be1e2c794b42c12.zip | |
Don't skip same branch revisions when inferring multiple merge parents.
Experience with the mono tree shows that it isn't too annoying, and
there might be some useful history hidden in there.
| -rw-r--r-- | src/svn.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/svn.cpp b/src/svn.cpp index afb037e..d29328a 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -670,15 +670,11 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha // // If this path was copied from elsewhere, use it to infer _some_ - // merge points. However, if the copy was from earlier in the - // same branch, we ignore it, since it is unlikely to improve the - // quality of the history. - // - // This is totally a heuristic, but is fairly useful for tracking + // merge points. This heuristic is fairly useful for tracking // changes across directory re-organizations and wholesale branch // imports. // - if (path_from != NULL && prevrepository == repository && prevbranch != branch) + if (path_from != NULL && prevrepository == repository) txn->noteCopyFromBranch (prevbranch, rev_from); if (change->change_kind == svn_fs_path_change_replace && path_from == NULL) |