; Sent: Wednesday, 27 March 2013, 12:31
> Subject: Re: [PATCH] Update and switch APIs call conflict resolver at end of
> operation
>
> On Wed, Mar 27, 2013 at 12:22 PM, Julian Foad
> wrote:
>> Discussing the behaviour of the backward-compatibility APIs:
>>
>>
On Wed, Mar 27, 2013 at 12:22 PM, Julian Foad
wrote:
> Discussing the behaviour of the backward-compatibility APIs:
>
>
> Bert wrote:
>> I don't think the strict ordening will be a problem for old clients at the
>> client level. We don't promis ordering in the ra layers anyway and we have
>> chang
Discussing the behaviour of the backward-compatibility APIs:
Bert wrote:
> I don't think the strict ordening will be a problem for old clients at the
> client level. We don't promis ordering in the ra layers anyway and we have
> changed the ordering many times before. As long as we call the callb
I don’ t think the strict ordening will be a problem for old clients at the
client level. We don't promis ordering in the ra layers anyway and we have
changed the ordering many times before. As long as we call the callbacks I
think clients would be fine. And it will solve the existing problem of
Stefan Sperling wrote:
> On Tue, Mar 26, 2013 at 04:26:33PM +, Julian Foad wrote:
>> With this patch, subversion/svn/update-cmd.c:svn_cl__update() will do this:
>>
>> * Call svn_client_update4(...)
>>
>> - with ctx->conflict_func2 set to svn_cl__conflict_func_interactive()
>>
On Tue, Mar 26, 2013 at 04:26:33PM +, Julian Foad wrote:
> With this patch, subversion/svn/update-cmd.c:svn_cl__update() will do this:
>
> * Call svn_client_update4(...)
>
> - with ctx->conflict_func2 set to svn_cl__conflict_func_interactive()
> which does interactive or non-inter
6
> Subject: [PATCH] Update and switch APIs call conflict resolver at end of
> operation
>
> Following on from the fix for issue #4316 "Merge errors out after resolving
> conflicts" r1459012, in which I made the merge APIs call the conflict
> resolver callback for all
Following on from the fix for issue #4316 "Merge errors out after resolving
conflicts" r1459012, in which I made the merge APIs call the conflict resolver
callback for all conflicts before returning, I mentioned that we should do the
same for update and switch [1]. I'll explain a bit more.
Cur
8 matches
Mail list logo
