Re: preserved-conflict-file-exts

On 11.03.2014 12:20, Magnus Carlsson wrote:
> Hi All,
>
> I'm having an issue with a special compare and merge tool I'm trying
> to use with TortoiseSVN.
>
> The tool is checking the file extensions of the two files before
> launching and gives me an error as the conflict files have changed
> extension to reflect it's revision.
>
> To solve this I'm investigating the configuration option
> preserved-conflict-file-exts.
>
> I have tried setting it in the config file using the TortoiseSVN
> Settings, Edit on subversion configuration file and I have also tried
> setting the same in the registry.
>
> For some reason TortoiseSVN doesn't seem to respect my setting but
> instead creates conflict files as normal changing the extension to
> .r123

the preserved-conflict-file-exts option is not a true/false option but
you have to specify the extensions you want to keep there. Also, svn is
case-sensitive so if your file extensions are e.g. 'DOC' but you
specified 'doc' in the config file, they won't match and your extensions
get replaced b .r123 anyway.

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=3074382
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].