Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (athena.apache.org: domain of culan77@gmail.com designates
 209.85.213.193 as permitted sender)
MIME-Version: 1.0
Date: Thu, 13 Mar 2014 11:01:58 +0100
Message-ID: 
 <CA+wNicNyPNsVbnuYNq4w4SJDFY4gGKmiBAU3AXf-soZg64b16A@mail.gmail.com>
Subject: preserved-conflict-file-exts
From: Magnus Carlsson <culan77@gmail.com>
To: users@subversion.apache.org
Content-Type: multipart/alternative; boundary=047d7ba979784220da04f47a0b0f

--047d7ba979784220da04f47a0b0f
Content-Type: text/plain; charset=ISO-8859-1

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

--047d7ba979784220da04f47a0b0f
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">Hi,<div><br></div><div>I have an issue with the setting:=
=A0preserved-conflict-file-exts from the subversion config file.</div><div>=
<br></div><div>I&#39;m using svn 1.8.8 (r1568071)</div><div><br></div><div>=
I have some files that has the extension .TcPOU</div>
<div>I have a special compare &amp; merge utility for these files.</div><di=
v>Unfortunately the compare &amp; 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.</div>
<div><br></div><div>To solve the issue I&#39;m trying out the=A0preserved-c=
onflict-file-exts setting.</div><div><br></div><div>I&#39;m not able to get=
 this to work.</div><div>I have tried multiple settings but no one so far h=
as made any difference.</div>
<div><br></div><div>I have tried:</div><div>preserved-conflict-file-exts =
=3D tcpou<br></div><div><br></div><div>I also tried (suspecting case sensit=
iveness):</div><div>preserved-conflict-file-exts =3D TcPOU<br></div><div><b=
r>
</div><div>and finally i tried also:</div><div>preserved-conflict-file-exts=
 =3D *<br></div><div><br></div><div>Still, when merging back a branch to th=
e trunk causing a conflict i get these files:</div><div><br></div><div>test=
.TcPOU</div>
<div>test.TcPOU.working</div><div>test.TcPOU.merge-left.r207</div><div>test=
.TcPOU.merge-right.r216</div><div><br></div><div><br></div><div>It seems sv=
n does not honor the setting at all.</div><div>I have tried making the sett=
ing both in the config file and in the registry (yes, I&#39;m currently on =
windows 7 machine).</div>
<div>But, if i understand correctly, the config file has precedence over th=
e registry.</div><div><br></div><div>Is there anyone who has any experience=
 in using this setting?</div><div><br></div><div>Grateful for any help.</di=
v>
<div><br></div><div><br></div><div>/ Magnus</div><div><br></div><div><br></=
div><div><br></div></div>

--047d7ba979784220da04f47a0b0f--