[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Making delete resolve tree conflicts

From: Bert Huijben <bert_at_qqmail.nl>
Date: Thu, 5 May 2011 21:16:55 +0200

> -----Original Message-----
> From: Greg Stein [mailto:gstein_at_gmail.com]
> Sent: donderdag 5 mei 2011 21:04
> To: Philip Martin; Julian Foad
> Cc: dev_at_subversion.apache.org
> Subject: Re: Making delete resolve tree conflicts

> >>   - delete all conflicts
> >
> >> I still favour making delete remove all tree conflicts.  It's both easy
> >> to implement and easy to explain.  It's also what happens with text and
> >> property conflicts.
> >
> > I have to admit that simply deleting all conflicts seems like a nice
> > simple approach.  Simple in conceptual behaviour, I mean, and if it's
> > simple to implement too that's a bonus.
> wc_db could do this, as long as we put a check for conflicts up in
> svn_wc_delete() to look for unresolved conflicts.

The easiest place to block this is probably libsvn_client. It does already
perform a recursive status on the delete target to notice changes when you
don't add --force, so it would be easy to add this check.
And it would also allow deleting the conflict with --force.... Nice :-)


Is making 'svn rm' fail on conflicts backwards compatible?

Received on 2011-05-05 21:17:27 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.