Tortoise 1.6.7 merging binary files

Hello

Today I saw tortoise 1.6.7 merging binary files, and that scares me a bit.

It happened like this:
1. A collegue compiled the application which lead to an executable.
2. I compiled it too and did "svn add" and "svn commit". Properties:
   svn:executable : *
   svn:mime-type : application/octet-stream
3. Then running "svn update" using tortoise on the other machine led to
the message "merged". The scary bit is that it had differences after that.

I tried to reproduce that with the commandline client on linux (1.4.4) and
on windows (1.6.6) but it didn't "merge" the file. The error message was:
"Failed to add file 'rclpasswd.exe': an unversioned file of the same name
already exists"

Is that a tortoise 'feature'?
If yes should it only merge text files but not binaries?

Thanks
Martin

PS: Please CC me since I'm not on the list.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-27 01:00:35 CET