18

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?

dokaspar
  • 6,795
  • 14
  • 59
  • 87
Martin
  • 1,491
  • 3
  • 18
  • 35

2 Answers2

13

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

Martin
  • 1,491
  • 3
  • 18
  • 35
  • When I try that in both the Tortoise and the command line client I get an error: "_svn: E195012: 'http://server/Repo/trunk' must be from the same repository as 'workingcopy`_". Are you sure that's the problem? If you can reproduce it (ideally in a script), both the Tortoise and SVN devs would likely be keen on seeing it. – Patrick Quirk Dec 09 '14 at 13:57
  • I reproduce it here on my machine and another machine. I don't know how to reproduce it in a script, haven't tried commandline merge, only tortoisesvn. – Martin Dec 09 '14 at 14:02
  • i have posted a thread in tortoisesvn community tortoisesvn.tigris.org titled "not recording mergeinfo" – Martin Dec 09 '14 at 14:12
  • I have found we have the same problem after moving our SVN server ... however, the repo path shown in the working copy, and the remote one, is identical; no case issue in our case. – Matteo Tassinari Jun 22 '16 at 09:39
0

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.

Andreas Eidmann
  • 1
  • 1