Philip Martin <philip.mar...@wandisco.com> writes: > Markus Schaber <m.scha...@3s-software.com> writes: > >> Here's the second iteration: >> >> [[[ >> 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. >> >> ]]] > > Have you run the regression tests? I get: > > FAIL: merge_tests.py 1: performing a merge, with mixed results > FAIL: merge_tests.py 70: cyclic merges don't add mergeinfo from own history > FAIL: merge_tests.py 93: natural history filtering permits valid mergeinfo > FAIL: update_tests.py 66: update locally modified file to equal versions > > The update test fail is because you need to set the expected_output to > 'G '. I haven't looked at the others.
The patch uses tabs for indentation. Please use spaces. -- Philip
