AW: Conflict on identical binary files
From: Markus Schaber <m.schaber_at_3s-software.com>
Date: Mon, 27 Feb 2012 07:42:29 +0000
Von: Philip Martin [mailto:philip.martin_at_wandisco.com]
>> The last step (svn update) triggers a conflict prompt for svnobj,
> 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. :-)
-- ___________________________ 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: firstname.lastname@example.org | 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
This is an archived mail posted to the Subversion Dev mailing list.