[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Every merge suggest changes to same files

From: Bob Archer <bob.archer_at_amsi.com>
Date: Sun, 19 Apr 2009 11:36:05 -0400

> Expected behavior:
> When I commit, In the changes made dialog, I would expect only the
> somefile.txt file to be shown. I haven't made any changes to the other
> files
> listed, so I don't understand why they are shown.
>
> Can someone explain this behavior to me?
>
> Martin

If you look at those files you will probably see the merge properties
were added. It shouldn't happen. Although from reading the svn mail list
it is supposed to be fixed as of 1.5.5. What version of TSVN are you
using? What version is your server? Does the same thing happen if you
run the merge from the svn CLI?

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-19 17:36:23 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.