[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 21 Oct 2013 14:31:56 +0100 (BST)

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 [used] by the code anywhere.

This area of conflict handling is buggy and incomplete.  For example, in conflict_status_walker(): "/* ### Bug: ignores result->save_merged */".

- Julian
Received on 2013-10-21 15:35:59 CEST

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