Re: Making delete resolve tree conflicts

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").

Cheers,
-g
Received on 2011-05-05 21:31:44 CEST