On 7/26/2016 17:58, Stefan Hett wrote: > On 7/26/2016 5:46 PM, Stefan Hett wrote: >> Hi, >> >> based on the talk on IRC with stsp and Bert I'd like to propose the >> following patch which would resolve an issue in TSVN when selecting >> to prefer the local version of a binary file in conflict (see: "code >> location related to investigate potential issue in resolve dialog" >> thread on the TSVN user's mailing list for further details). >> >> [[[ >> Teach build_text_conflict_resolve_items() to skip installling files, >> if these >> are not required to resolve the conflict. >> >> * libsvn_wc/conflicts.c >> (build_text_conflict_resolve_items): introduce new >> allow_ski_install variable >> and set it in the two cases >> where we >> simply accept the current >> local file to >> resolve the conflict. >> ]]] >> > Attached is a revised patch replacing the tabs with whitespaces of the > original patch (spotted by stsp). > I just ran the regression tests on 1.9.4 against the patch and this causes three test failures:
- basic#11 - update#38 - third one I didn't note down unfortunately Therefore I pull back this patch nomination until I either resolve the test failure or come up with a different approach not breaking the tests. Running the basic#11 test this produces the following error: W: ============================================================= Expected 'mu' and actual 'mu' in status tree are different! ============================================================= EXPECTED NODE TO BE: ============================================================= * Node name: mu Path: svn-test-work\working_copies\basic_tests-11.backup\A\mu Contents: None Properties: {} Attributes: {'status': 'M ', 'wc_rev': '2'} Children: None (node is probably a file) ============================================================= ACTUAL NODE FOUND: ============================================================= * Node name: mu Path: svn-test-work\working_copies\basic_tests-11.backup\A\mu Contents: None Properties: {} Attributes: {'status': ' ', 'wc_rev': '2'} Children: None (node is probably a file) Am I reading this correct in that the modified status was lost? Regards, Stefan