subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Magnus Carlsson <cula...@gmail.com>
Subject preserved-conflict-file-exts
Date Thu, 13 Mar 2014 10:01:58 GMT
Hi,

I have an issue with the setting: preserved-conflict-file-exts from the
subversion config file.

I'm using svn 1.8.8 (r1568071)

I have some files that has the extension .TcPOU
I have a special compare & merge utility for these files.
Unfortunately the compare & merge tool first starts with checking the file
extension of the two files and if it does not match, will close with an
error message.

To solve the issue I'm trying out the preserved-conflict-file-exts setting.

I'm not able to get this to work.
I have tried multiple settings but no one so far has made any difference.

I have tried:
preserved-conflict-file-exts = tcpou

I also tried (suspecting case sensitiveness):
preserved-conflict-file-exts = TcPOU

and finally i tried also:
preserved-conflict-file-exts = *

Still, when merging back a branch to the trunk causing a conflict i get
these files:

test.TcPOU
test.TcPOU.working
test.TcPOU.merge-left.r207
test.TcPOU.merge-right.r216


It seems svn does not honor the setting at all.
I have tried making the setting both in the config file and in the registry
(yes, I'm currently on windows 7 machine).
But, if i understand correctly, the config file has precedence over the
registry.

Is there anyone who has any experience in using this setting?

Grateful for any help.


/ Magnus

Mime
View raw message