On Sat, Feb 4, 2017 at 4:41 PM, Stefan Kueng <tortoise...@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
