> -----Original Message-----
> From: Bert Huijben [mailto:b...@qqmail.nl]
> Sent: donderdag 13 maart 2014 11:52
> To: 'Magnus Carlsson'; users@subversion.apache.org
> Subject: RE: preserved-conflict-file-exts
>
> > -----Original Message-----
> > From: Magnus Carlsson [mailto:cula...@gmail.com]
> > Sent: donderdag 13 maart 2014 11:02
> > Subject: preserved-conflict-file-exts
> >
> > 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
>
> Yes, Subversion is case sensitive, so this last one should work...
>
> >
> > 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
>
> Ah... and here you describe the real problem.
>
> > 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.
>
> It looks like we only implemented the extension preserve code for update
> and
> switch scenarios and never for merging.
Thanks to your e-mail (and me wondering why this was never implemented) this
feature is now implemented on trunk.
If nothing strange happens, you should see it working in Subversion 1.9 post
alpha 2 (or maybe even a future 1.8 release)
Bert
