On Thu, Nov 01, 2018 at 05:38:48PM +0100, Branko Čibej wrote:
> On 01.11.2018 17:25, Stefan Sperling wrote:
> > While many SVN operations support a dry-run mode, at present the conflict
> > resolver does not. It might actually be nice to see what the resolver would
> > do while in dry-run mode. A d
On Thu, Nov 01, 2018 at 05:25:10PM +0100, Stefan Sperling wrote:
> Until the resolver grows such a dry-run mode I think your patch makes sense.
> Do we agree here?
Committed in https://svn.apache.org/r1845557 with small whitespace
adjustments to keep lines below 80 columns in length.
I have also e
On 01.11.2018 17:25, Stefan Sperling wrote:
> On Thu, Nov 01, 2018 at 10:32:56AM +, Jonathan Guy wrote:
>> Ok I looked into this a bit more and I see what's going on now.
>> The post merge conflict resolver runs because the merge operation reported
>> conflicts (via the conflict stats).
>> Thi
On Thu, Nov 01, 2018 at 10:32:56AM +, Jonathan Guy wrote:
> Ok I looked into this a bit more and I see what's going on now.
> The post merge conflict resolver runs because the merge operation reported
> conflicts (via the conflict stats).
> This calls
> svn_client_conflict_walk
> which
Ok I looked into this a bit more and I see what's going on now.
The post merge conflict resolver runs because the merge operation reported
conflicts (via the conflict stats).
This calls
svn_client_conflict_walk
which calls
svn_wc_walk_status
which reports no conflict at that pat
On Wed, Oct 31, 2018 at 09:46:23AM +, Jonathan Guy wrote:
> Hi Stephan
> Thanks for the reply.
> I did see code section you refer to however the svn_client__resolve_conflicts
> will only be called if you have ctx->conflict_func2.
> That function (AFAIK) is only installed if an “accept” option
Hi Stephan
Thanks for the reply.
I did see code section you refer to however the svn_client__resolve_conflicts
will only be called if you have ctx->conflict_func2.
That function (AFAIK) is only installed if an “accept” option is supplied as
the code below
/* Install a legacy conflict handler
On Tue, Oct 30, 2018 at 06:39:49PM +, Jonathan Guy wrote:
> [[[
> *subversion/svn/merge-cmd.c
> (svn_cl__merge): Suppress the interactive conflict resolver
> if a merge has been performed with the dry-run option.
> ]]]
Hi Jonathan,
Thank your for the patch. I am afraid I misled you earlier b
[[[
*subversion/svn/merge-cmd.c
(svn_cl__merge): Suppress the interactive conflict resolver
if a merge has been performed with the dry-run option.
]]]
merge-cmd.c.patch
Description: Binary data
9 matches
Mail list logo
