Re: [TSVN] Application/octetstream

Amir Kolsky wrote:
> Someone suggested that with said mime type svn will not attampt a merge.
> Well, .dll are automatically given this type and merge is still
> attempted. Any ideas?

That depends on what you understand by 'merging'. You see, Subversion
can't 'merge' binary files like text files. If you have a text file
modified locally, and it also got changed in the repository by someone
else, Subversion can merge them if the changes you and the other person
made are not on the same lines (otherwise you'll get a conflict). With
binary files, Subversion will only 'merge' them if it got modified only
on *one* end. If a binary file got modified on two ends, then you'll get
a conflict *every* time.

If you try a merge (by using the merge dialog), Subversion can 'merge'
binary files too, but you'll get much more conflicts as you would get
with text files.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org