| Log Message: |
Always install a .mine file for conflicted binary files, not just in
case the binary file was detranslated.
This makes the 'mine-full' option work again from the conflict prompt.
Before this change, an assertion in libsvn_wc failed when the 'mine-full'
option was used since no path for 'mine' was recorded in conflict storage.
* subversion/libsvn_wc/merge.c
(merge_binary_file): Always create .mine, if necessary as a copy
of the conflicted working file. Update docstring.
* subversion/tests/cmdline/merge_tests.py
(dry_run_merge_conflicting_binary): Update on-disk test expectations.
|
subversion/trunk/subversion/libsvn_wc/merge.c