Re: Tortoise 1.6.7 merging binary files

On 27.01.2010 00:14, Martin Furter wrote:
> 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?

It's an svn feature: run
$ svn up --force
and you'll get the same result.

The file isn't actually merged. What happens is this:
* the update has to add the new file
* there already is a file with the same name in your working copy
* the file from the repository is downloaded, but your local file
   is kept
* the file is shown as modified, because the file you had in your
   working copy is different than the one from the repository. But
   the file you now see as modified is the unchanged file you had
   before (but it's BASE is the one from the repository).

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2442497
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].