Hi, all, Here's the third iteration.
Compared to the second iteration, I changed the comments a little bit, and now return svn_wc_merge_unchanged in merge_file_trivial(). This makes all tests in test_merges.py and test_updates.py pass as expected. Note that merge_file() in update_editor.c will finally set the content_state to svn_wc_notify_state_merged, so for the user the file is displayed as "G" for merged. Thus, the behaviour for text files is identical (just with a different code path), where binary files now behave the same way as textfiles always did. AFAICS, the only remaining issue is that --diff3-cmd is now no longer triggered for text files in this case, but I'm not sure whether that really is a problem. [[[ libsvn_wc: no conflict for identical files [ in subversion/libsvn_wc ] * merge.c (merge_file_trivial): Successful report merged when incoming file is identical to existing, locally modified file. [ in subversion/tests/cmdline ] * update_tests.py (update_binary_file_3): Remove XFAIL marker. ]]] Best regards Markus Schaber -- We software Automation. 3S-Smart Software Solutions GmbH Markus Schaber | Developer Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 | Fax +49-831-54031-50 Email: m.scha...@3s-software.com | Web: http://www.3s-software.com CoDeSys internet forum: http://forum.3s-software.com Download CoDeSys sample projects: http://www.3s-software.com/index.shtml?sample_projects Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915
4128.diff
Description: 4128.diff
