Author: luke1410
Date: Sun Aug 28 16:15:32 2016
New Revision: 1758129
URL: http://svn.apache.org/viewvc?rev=1758129&view=rev
Log:
Fix issue #4647 by resolving the error case for binary file conflicts
selecting to use the full local version, by allowing using the local file, if
no merged file is present.
* subversion/libsvn_wc/conflicts.c
(build_text_conflict_resolve_items): in case mine_abspath is null, take
local_abspath instead in case of
svn_wc_conflict_choose_mine_full
Suggested by: stsp
Approved by: rhujiben
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1758129&r1=1758128&r2=1758129&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Sun Aug 28 16:15:32 2016
@@ -1623,7 +1623,14 @@ build_text_conflict_resolve_items(svn_sk
}
case svn_wc_conflict_choose_mine_full:
{
- install_from_abspath = mine_abspath;
+ /* In case of selecting to resolve the conflict choosing the full
+ own file, allow the text conflict resolution to just take the
+ existing local file if no merged file was present (case: binary
+ file conflicts do not generate a locally merge file).
+ */
+ install_from_abspath = mine_abspath
+ ? mine_abspath
+ : local_abspath;
break;
}
case svn_wc_conflict_choose_theirs_conflict:
