Hi, Daniel, Daniel Shahaf [mailto:d...@daniel.shahaf.name] > Till Maas wrote on Tue, Aug 09, 2011 at 19:45:20 +0200: > > I would like to propose to add a way to abort updates in case of an > > conflict. This could be done by adding e.g. an abort command to the > > interactive conflict resolution. This should transform the working > > copy to the situation before the update that resulted in an conflict > happend. > svn update --accept=merge --config-option=config:helpers:diff3-cmd='kill > $PPID' || svn cleanup
Will "svn cleanup" really revert all the already updated files back to the original state? 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
