Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm
Precedence: bulk
MIME-Version: 1.0
In-Reply-To: <6a1d3ef8-8888-5ca4-f036-f33fa4c078c7@gmail.com>
References: <68b74702-0be0-c402-3fce-982713dc8676@gmail.com>
 <20170204101615.n52atjsucsqlqpdg@jim.stsp.name> <beec894d-0b36-2fb8-7f95-01580c3e9434@gmail.com>
 <20170204131245.b52zx5nzpe6wvntv@jim.stsp.name> <6a1d3ef8-8888-5ca4-f036-f33fa4c078c7@gmail.com>
From: =?UTF-8?B?U3RlZmFuIEvDvG5n?= <tortoisesvn@gmail.com>
Date: Sat, 4 Feb 2017 16:57:45 +0100
Message-ID: <CAH=6jSbrcRuvwFTQWzA=3TccXeJy-eWcReE_ZiXUi9WCeCBY9Q@mail.gmail.com>
Subject: Re: wish for new API or extended one
To: Subversion Development <dev@subversion.apache.org>
Content-Type: multipart/alternative; boundary=001a11455678c18c5f0547b676ef
archived-at: Sat, 04 Feb 2017 15:58:18 -0000

--001a11455678c18c5f0547b676ef
Content-Type: text/plain; charset=UTF-8

On Sat, Feb 4, 2017 at 4:41 PM, Stefan Kueng <tortoisesvn@gmail.com> wrote:

>
>
> On 04.02.2017 14:12, Stefan Sperling wrote:
>
>> On Sat, Feb 04, 2017 at 01:45:10PM +0100, Stefan Kueng wrote:
>>
>>> On 04.02.2017 11:16, Stefan Sperling wrote:
>>>
>>>> On Sat, Feb 04, 2017 at 09:23:06AM +0100, Stefan Kueng wrote:
>>>>
>>>>> Hi,
>>>>>
>>>>> while trying out the new conflict resolver APIs I came upon a slight
>>>>> problem. The API svn_client_conflict_option_get_description() returns
>>>>> a
>>>>> string that can be used to show to the user as a choice - in TSVN that
>>>>> would
>>>>> be the text on a two-line button (the 'label' is the first line, the
>>>>> 'description' the second line).
>>>>>
>>>>> The problem I'm having now is that the description is always the same,
>>>>> even
>>>>> if there are multiple 'moved-to-candidates' available. And if we use
>>>>> another
>>>>> than the first moved-to-candidate, the description mentions the wrong
>>>>> path.
>>>>>
>>>>
>>>> So you're calling svn_client_conflict_option_set
>>>> _moved_to_repos_relpath()
>>>> and if you then get the description again the path isn't updated?
>>>> That would be a bug.
>>>>
>>>
> So I tried exactly that, and for me the description is not updated. It
> returns the same description no matter what move path index I set: the
> description always mentions the first path.
>
> But fetching the path with
> const char * p = APR_ARRAY_IDX(possible_moved_to_repos_relpaths, j, const
> char *);
> shows a different path.
>
> Another thing that confuses me:
> After calling get_details(), the description mentions which path is the
> reason for the conflict. So why does svn_client_conflict_option_get
> _moved_to_repos_relpath_candidates still get me a list of paths to chose
> from if the path is already known?
> I'm a little bit confused...
>

Sorry, confusion fixed. After going through the code a little bit I now
understand why.

But the problem with the description not being updated still persists.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

--001a11455678c18c5f0547b676ef
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><br><div class=3D"gmail_extra"><br><div class=3D"gmail_quo=
te">On Sat, Feb 4, 2017 at 4:41 PM, Stefan Kueng <span dir=3D"ltr">&lt;<a h=
ref=3D"mailto:tortoisesvn@gmail.com" target=3D"_blank">tortoisesvn@gmail.co=
m</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_quote" style=3D"margi=
n:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=3D"">=
<br>
<br>
On 04.02.2017 14:12, Stefan Sperling wrote:<br>
<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
x #ccc solid;padding-left:1ex">
On Sat, Feb 04, 2017 at 01:45:10PM +0100, Stefan Kueng wrote:<br>
<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
x #ccc solid;padding-left:1ex">
On 04.02.2017 11:16, Stefan Sperling wrote:<br>
<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
x #ccc solid;padding-left:1ex">
On Sat, Feb 04, 2017 at 09:23:06AM +0100, Stefan Kueng wrote:<br>
<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
x #ccc solid;padding-left:1ex">
Hi,<br>
<br>
while trying out the new conflict resolver APIs I came upon a slight<br>
problem. The API svn_client_conflict_option_get<wbr>_description() returns =
a<br>
string that can be used to show to the user as a choice - in TSVN that woul=
d<br>
be the text on a two-line button (the &#39;label&#39; is the first line, th=
e<br>
&#39;description&#39; the second line).<br>
<br>
The problem I&#39;m having now is that the description is always the same, =
even<br>
if there are multiple &#39;moved-to-candidates&#39; available. And if we us=
e another<br>
than the first moved-to-candidate, the description mentions the wrong path.=
<br>
</blockquote>
<br>
So you&#39;re calling svn_client_conflict_option_set<wbr>_moved_to_repos_re=
lpath()<br>
and if you then get the description again the path isn&#39;t updated?<br>
That would be a bug.<br>
</blockquote></blockquote></blockquote>
<br></span>
So I tried exactly that, and for me the description is not updated. It retu=
rns the same description no matter what move path index I set: the descript=
ion always mentions the first path.<br>
<br>
But fetching the path with<br>
const char * p =3D APR_ARRAY_IDX(possible_moved_t<wbr>o_repos_relpaths, j, =
const char *);<br>
shows a different path.<br>
<br>
Another thing that confuses me:<br>
After calling get_details(), the description mentions which path is the rea=
son for the conflict. So why does svn_client_conflict_option_get<wbr>_moved=
_to_repos_relpath_candid<wbr>ates still get me a list of paths to chose fro=
m if the path is already known?<br>
I&#39;m a little bit confused...<br><div class=3D"HOEnZb"><div class=3D"h5"=
></div></div></blockquote><div><br></div><div>Sorry, confusion fixed. After=
 going through the code a little bit I now understand why.<br><br></div><di=
v>But the problem with the description not being updated still persists.<br=
><br></div><div>Stefan<br clear=3D"all"></div></div><br>-- <br><div class=
=3D"gmail_signature" data-smartmail=3D"gmail_signature">=C2=A0 =C2=A0 =C2=
=A0=C2=A0 ___<br>=C2=A0 oo=C2=A0 // \\=C2=A0 =C2=A0 =C2=A0 &quot;De Cheloni=
an Mobile&quot;<br>=C2=A0(_,\/ \_/ \=C2=A0 =C2=A0=C2=A0 TortoiseSVN<br>=C2=
=A0=C2=A0 \ \_/_\_/&gt;=C2=A0 =C2=A0 The coolest Interface to (Sub)Version =
Control<br>=C2=A0=C2=A0 /_/=C2=A0=C2=A0 \_\=C2=A0 =C2=A0=C2=A0 <a href=3D"h=
ttp://tortoisesvn.net" target=3D"_blank">http://tortoisesvn.net</a></div>
</div></div>

--001a11455678c18c5f0547b676ef--