Hi, Von: Philip Martin [mailto:philip.mar...@wandisco.com] > Markus Schaber <m.scha...@3s-software.com> writes:
>> The last step (svn update) triggers a conflict prompt for svnobj, >> despite the fact that the remote and local files are bit-for-bit >> identical. >> >> As I was told by Daniel Shahaf, he expects this case to be resolved >> without a conflict. > We could resolve the conflict in this case, but there is currently no code to > do it. Perhaps libsvn_wc/merge.c:merge_file_trivial could detect this case > and set svn_wc_merge_unchanged? As discussed on IRC, and as a first step to the solution, I created a test case on the weekend. See the attached diff. I hope I'll find time to develop a fix during the next days (and actually get my feet wet deep in the Subversion code base for the first time - woohoo. :-) 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
update_tests.py.patch
Description: update_tests.py.patch
