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

(I already posted this on the svn-users list, but got no answer so far)

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). In the merge dialogs, I'm using the option "Merge a range of revisions" and I do not specify a revision range (as I want to merge all revisions since the branch was created).

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.

As an example, I see lots of files in my working copy with the following difference/modification:

Property changes on: C:\Projects\MyProj?ect-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?
What is the correct/best way to proceed?

I tried this with TSVN 1.5.8 and also with todays daily build (1.5.99 build 15481) and see the same behaviour with both.

The server is running SVN 1.5.4.

Thanks a lot for your help
Martin

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1225619

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-25 17:48:47 CET