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

Re: tree-conflict: block dir if it contains victims?

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 22 Oct 2008 11:58:01 +0100

Neels J. Hofmeyr wrote:
> in the process of not marking tree-conflict parent dirs as conflicted, I'm
> removing lots of checks whether a directory contains tree-conflicts and am
> replacing them with checks whether the directory itself is a victim.
>
> Does that break some basic concept, like, say, commit should be blocked for
> the complete parent directory in the presence of tree-conflicted children?
> (If we have that concept, I'd like to change it.)

What you're doing is exactly what I want and expect. +1.

In particular, it's good to be able to commit property changes on a
directory that has some tree-conflicted children, and it's good to be
able to commit other children in a directory that has some
tree-conflicted children.

- Julian

> Thanks for any reassurance,
> ~Neels

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-22 12:58:18 CEST

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