Ace Olszowka


r1845577 | stsp | 2018-11-02 11:42:35 +0000 (Fri, 02 Nov 2018)

Add resolver support for 'added file vs unversioned file' with update/switch.

Make the conflict resolver handle conflicts recorded during update and switch
operations where a newly added file was obstructed by an unversioned file.
The resolver will now offer the 'incoming_added_file_text_merge' option
in this case, allowing users to merge unversioned files with incoming
newly added files.

Because 'merge' currently skips unversioned files and does not even record
a conflict for them, this change only affects 'update' and 'switch'.
Supporting unversioned file conflicts during merges can be revisited later.

Suggested by: Ace Olszowka

* subversion/libsvn_client/conflicts.c
  (resolve_merge_incoming_added_file_text_update): Handle unversioned files
   in addition to versioned files.
  (configure_option_incoming_added_file_text_merge): Enable this option
   for the case where the local file is unversioned.

* subversion/tests/libsvn_client/conflicts-test.c
  (new_file_content): Declare.
   test_switch_file_add_vs_unversiond_file, test_funcs): New tests.