svn:mergeinfo property added by merge

Hi, I'm sorry for disturbing the dev list, but I'm not sure whether I'm seeing a svn bug and how I should proceed.

(I got no answer on the svn-users and TSVN lists: http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1219898):

Short version of the problem: after a first merge from trunk to a feature branch, I have lots of files in my (branch-)working copy where a svn:merginfo property was added. The files have no other change and they were never modified on trunk and branch since the creation of the branch.

How should I proceed to be able to easily reintegrate the branch to trunk in the future:
- Should I commit the files which have only a property-change to the branch or should I exclude them?
- Is it a SVN bug, which is solved in a newer version (e.g. in the upcoming 1.6)?

I was using TSVN 1.5.7/1.5.8, based on SVN 1.5.5 on the client and subversion 1.5.4 on the server.

Thanks for your help.

Martin

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1255482
Received on 2009-03-02 13:12:06 CET