After a merge some files are (erroneously?)shown as modifed

Hi, I have created a feature branch some time ago and now I want to update (sync) it with the changes made on trunk in the meantime.

Therefore I'm merging from trunk into my working copy (which is based on the feature branch). After the merge some files in my working copy are show as modfied, even though they were not modified in trunk or in my branch since the branch was created.

I'm using TortoiseSVN, so I don't know what the exact SVN commands are, but here are the details (as far as I know them):

The server is running SVN 1.5.4.
The client uses TSVN 1.5.8 (based on SVN 1.5.5).
I'm merging any revisions from trunk to my branch (since the branch was created). No merge has been made before.

After the merge I can see the following difference on a file:

Property changes on: C:\Projects\MyProject-branchXY\libs\SomeLib.dll
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/libs/SomeLib.dll:r2718-2814

Why am I seeing this? Is this a bug, am I making a mistake or is this expected.

Thanks a lot for your help
Martin

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1219898

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-24 12:28:01 CET