AW: new conflict callback API
From: Markus Schaber <m.schaber_at_3s-software.com>
Date: Wed, 16 May 2012 13:42:57 +0000
Von: Julian Foad [mailto:julianfoad_at_btopenworld.com]
I also think this is a good way to go. Some Clients may have additional semantic knowledge which helps to resolve the conflicts.
On the other hand, those clients can always decide to just skip all conflicts, and then use "svn status" and normal working copy operations to do whatever they want.
But I wonder whether it is a good, orthogonal design when the set of available conflict-resolving operations differs between "during the update operation" and "after the update operation".
I guess this is a nice topic for the hackathon, handling tree conflicts in a "nice" way is one of the next tasks in our SharpSVN-based "CoDeSys SVN".
> Certainly the set of available client-lib operations could include some of
-- ___________________________ 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: email@example.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 167014915Received on 2012-05-16 15:43:38 CEST
This is an archived mail posted to the Subversion Dev mailing list.