svn update --accept=merge --config-option=config:helpers:diff3-cmd='kill $PPID' || svn cleanup
Till Maas wrote on Tue, Aug 09, 2011 at 19:45:20 +0200:
> Hi,
>
> 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.
>
> The reason I would like to have this is because on a project I work on
> it regularly happens that one committer accidently reverts changes made
> by other that result in an conflict. In this case usually the easiest
> way to fix this is to (partially) revert the conflicting commit and then
> update. Therefore it would be nice to be able to abort an update that
> results in a conflict, wait for the other commiter to revert the
> conflicting commit and update then.
>
> Regards
> Till
Received on 2011-08-10 02:00:34 CEST