Conflict handling for non-text files

Ben Collins-Sussman sussman at red-bean.com
Tue Jul 10 09:41:52 CDT 2007


Auke is totally right.  The book needs to be corrected.

On 7/10/07, C. Michael Pilato <cmpilato at collab.net> wrote:
> This from Auke Jilderda <auke at collab.net> in private correspondence:
>
> When generating a conflict with a binary file (PDF), my TortoiseSVN does
> not behave as the book describes [1]:
>
>     So, for versioned files whose svn:mime-type property is set to a
>     non-textual MIME type (generally, something that doesn't begin with
>     text/, though there are exceptions), Subversion does not attempt to
>     perform contextual merges during updates. Instead, any time you have
>     locally modified a binary working copy file that is also being
>     updated, your file is renamed with a .orig extension, and then
>     Subversion stores a new working copy file that contains the changes
>     received during the update, but not your own local modifications, at
>     the original filename.
>
> Instead, it does the following:
> - it leaves the original file with my local modifications
> - it generates two temporary files (.oldrev and .newrev), the former
>   without either changes and the latter with the received changes.
>
> The latter seems more in line with how other conflicts are handled but
> it seems this section of the book needs to be updated?
>
> 1.
> http://svnbook.red-bean.com/nightly/en/svn.advanced.props.file-portability.html#svn.advanced.props.special.mime-type
>
> --
> C. Michael Pilato <cmpilato at collab.net>
> CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
>
>
> _______________________________________________
> svnbook-dev mailing list
> svnbook-dev at red-bean.com
> http://www.red-bean.com/mailman/listinfo/svnbook-dev
>
>




More information about the svnbook-dev mailing list