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

[PATCH] Use consistent conflict resolution option

From: Stefan <luke1410_at_gmx.de>
Date: Fri, 14 Oct 2016 09:43:13 +0200


basically a follow-up patch for the previous patch (resolving
--accept=working for binary conflicts).
Separate patch since this change is technically not necessary to resolve
the test failure the previous fix resolved.

For consistent behavior use the same conflict resolution option for binary
text conflicts (note: no behavior change, since for binary conflicts
merged_text and working_text is semantically the same).

* subversion/svn/conflict-callbacks.c
  (resolve_conflict_by_accept_option): use svn_conflict_option_working_text
  for binary text conflicts in svn_cl__accept_working case


Received on 2016-10-14 09:44:12 CEST

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