[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn_wc_conflict_result_t.save_merged

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Mon, 21 Oct 2013 15:15:18 +0100

Branko Čibej <brane_at_wandisco.com> writes:

> On 18.10.2013 23:13, Branko Čibej wrote:
>> Can someone explain what the purpose of the save_merged flag in the
>> conflict result struct is? It's used once in our code, but as far as I
>> can see, the resulting .edited file isn't actually by the code anywhere.
>
> "Isn't actually *used by* the code anywhere"

I'm not sure what effect it has but I see it set by the client in:

 subversion/svn/conflict-callbacks.c:handle_text_conflict

and used by the library in:

 subversion/libsvn_wc/conflicts.c:resolve_text_conflict

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*
Received on 2013-10-21 16:15:57 CEST

This is an archived mail posted to the Subversion Dev mailing list.