Tortoisesvn skips recording mergeinfo

18
votes

I have checked out the trunk from one of our svn repos.

I then right click -> merge -> merge some revisions -> merge from branch A -> choose one revision and then finally apply the merge.

My TortoiseSVN updates the files, and updates the mergeinfo. When I commit these changes to trunk, tortoisesvn shows me the files to commit, and also the /trunk folder which is affected because the svn:mergeinfo has been updated.

My colleague has the exact same tortoisesvn installed, and does exactly the same thing. We have the exact same global ignore pattern. When he does the merge procedure, the svn:mergeinfo property on the trunk won't update. Only the files is merged. How is that possible? Is there a setting which tells tortoisesvn not to include mergeinfo when merging?

2
svnversion-controlmergetortoisesvnsvn-mergeinfo
Do both you and your colleague have the same version of Tortoise? If so, what version is it? – Patrick Quirk
TortoiseSVN 1.8.8, Build 25755 - 64 Bit , 2014/08/10 14:44:06 Subversion 1.8.10, -release apr 1.5.1 apr-util 1.5.3 serf 1.3.7 OpenSSL 1.0.1i 6 Aug 2014 zlib 1.2.8 – Martin
we both have the same version – Martin
There is checkbox in the merge dialog with the label "Ignore ancestry". It must not be checked. – TomWolk
TomWolk you saved my day... month :) – jotbek

2 Answers

13
votes

Well, this was awkward. If you do the merge and the URL to merge from has a different base URL than your working copy's checkout URL, the merge will perform, but no mergeinfo is recorded.

The difference in the URL string was a capital letter(!). So this means that the URL to merge from must be exactly equal to your trunk, also the casing of letters.

This must be a bug in tortoiseSVN?

Example: Checked out trunk from http://****/svn/repo/trunk Try to merge from url http://****/svn/Repo/branches/****

This will do the merge, but not record mergeinfo

0
votes

There is checkbox in the merge dialog with the label "Ignore ancestry". It must not be checked!

This comment of @TomWolk solved the problem for me.