Special revisions for conflicted files
From: Markus Schaber <m.schaber_at_codesys.com>
Date: Tue, 27 Nov 2012 07:59:08 +0000
Currently, we have special revisions "WORKING", "HEAD", "BASE", "COMMITTED", "PREV" which can be used internally in the API, as well as for "svn cat".
What about defining additional special revisions for conflicted files, like "OLDER" and "INCOMING"?
This would allow "offline" conflict resolving mechanisms to access the files involved in a conflict the same way as it can currently access BASE, WORKING and HEAD revisions.
Just a weird idea, but it would have saved me a bunch of special-casing in my CODESYS SVN integration...
-- CODESYS(r) a trademark of 3S-Smart Software Solutions GmbH Inspiring Automation Solutions 3S-Smart Software Solutions GmbH Dipl.-Inf. Markus Schaber | Product Development Core Technology Memminger Str. 151 | 87439 Kempten | Germany Tel. +49-831-54031-979 | Fax +49-831-54031-50 E-Mail: firstname.lastname@example.org | Web: http://www.codesys.com CODESYS internet forum: http://forum.codesys.com Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915Received on 2012-11-27 09:00:02 CET
This is an archived mail posted to the Subversion Dev mailing list.