CODEWITHSUNDEEP
svnversion-controlmerge
Dlongnecker
Dlongnecker

Reputation: 3047

SVN 1.4 Merge, revisions not appearing in log

I'm using SVN 1.4.2 and I branched at revision R, merged in the revisions from R-HEAD, and now when I look at the log on the branch, I only see revisions up to R, none between R and HEAD. Is it possible to get this information?

I am using TortoiseSVN 1.6, which is based on SVNClient 1.6.12. I did not have the "Only record the merge (block revisions from getting merged)" box checked. I tried "Inlcude merged revisions", but that apparently runs a mergeinfo which isn't supported until SVN 1.5.

Upvotes: 0

Views: 578

Answers (2)

Dingo
Dingo

Reputation: 3395

SVN 1.4 doesn't have merge tracking. Therefore, it has no way of knowing the source of a merged into a branch. If it doesn't know where a merge came from, it can't know where to get the log messages for that merge.

The only real solution is to upgrade your server to 1.5 or higher.

If you want logs from previous branches to appear, you'll need to recreate the branch and recommit the revisions.

Upvotes: 2

Dlongnecker
Dlongnecker

Reputation: 3047

It would appear that this is actually a feature.

Branches are supposed to be quick offshoots to build up some functionality without mucking up trunk. The whole merge, together, should only comprise one real change of trunk. The little incremental steps aren't supposed to be significant with regards to the trunk development.

In our case, a branch was made and developed for over a year. Ideally we'd have the history to look over, but our branching methodology violated the "correct" way to do things, and we will consequently lose history. There ARE ways to hack around this, but in our case fixing one hack with another hack is worse than losing some history and learning our lesson.

If anyone has a way to hack this together, please do share!

Thanks

Upvotes: 0

Related Questions