Hi there, Thanks for your reply. > Can you create a new repository... import your project in, create a > branch, do a merge and duplicate this? If so... show ALL the commands that > you did from creating the repo into a script. I'm guessing there is some > command or something you do and we are not seeing the full picture. >
Unfortunately I do not have ssh access to the svn server. This is a corporate environment and although our team manages its own svn repo I cannot log into the server. However, I will speak to the sysadmin to see if he can do that for me and post the results here. > For example, you say you run > > svn propdel svn:merginfo -R > > on trunk. Do you then commit that? You don't say. You don't say if you are > branching from a working copy or using a URL. Yes, I do commit that, and in fact I looked at the full log today since this issue puzzles me to such an extent that I was doubting of my own actions already, but the commit is there, and the fact is that if I do a clean checkout of the trunk there's no svn:mergeinfo there at all. There isn't any on the branch either, so for some reason old, deleted svn:mergeinfo properties are reappearing when merging. Those properties were accidentally added a while back while doing partial merges. Carles
