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?
>
> Amir Kolsky
> XP& Software
>

I think that might have been me. I also think I told you that it will
still need a merge, but that it will
leave the binary files on disk in all it's versions and expect you to
check them out and merge manually.
Well, that's assuming you've actually made local changes, otherwise svn
can just replace the file.

When you say 'merge is still attempted', what exactly do you mean?

B.t.w. it's not a good idea to version dll's if you have the
corresponding source code in the repo,
but that's unrelated.

/Nicke

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun May 1 20:22:42 2005