[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: Greg Stein <gstein_at_gmail.com>
Date: Thu, 5 May 2011 15:31:18 -0400

On Thu, May 5, 2011 at 15:16, Bert Huijben <bert_at_qqmail.nl> wrote:
>> 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

That feels too high level to me. It allows third party code to call
svn_wc_delete() and wipe out conflict info too easily.

> 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 :-)

param: svn_boolean_t ignore_conflicts

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

I say "no". That just seems the safe way to approach this. That we
didn't stop the operation before seems like a big mistake. We looked
for local mods, and I view conflicts in the same boat ("hey! you've
got something in this subtree").

Received on 2011-05-05 21:31:44 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.