AW: RFE: support to abort update in case of conflict

2011-08-10 Thread Markus Schaber
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.

Re: RFE: support to abort update in case of conflict

2011-08-09 Thread Daniel Shahaf
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 t

Re: support to abort update in case of conflict

2011-08-09 Thread Peter Samuelson
[Bob Archer] > Ok, isn't this just a reverse merge? I guess you didn't read the whole thread. His initial question made it pretty clear he's not doing a reverse merge, but asking for a new feature for 'svn update'. > Also, not sure why this is on the dev list... it should be on > users@s.a.o

RE: support to abort update in case of conflict

2011-08-09 Thread Bob Archer
> On Tue, Aug 09, 2011 at 03:55:00PM -0400, Bob Archer wrote: > > > 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

Re: support to abort update in case of conflict

2011-08-09 Thread Till Maas
On Tue, Aug 09, 2011 at 03:55:00PM -0400, Bob Archer wrote: > > 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 situati

RE: support to abort update in case of conflict

2011-08-09 Thread Bob Archer
> 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 r

RFE: support to abort update in case of conflict

2011-08-09 Thread Till Maas
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