Re: Unexpected tree conflict when deleting directory

2010-06-02 Thread Stefan Sperling
On Wed, Jun 02, 2010 at 05:45:53PM -0400, Brian Pitts wrote: > It is a little hard to wrap my head around the idea that although I > committed the change deleting foo/bar, I now have to update foo/ for > my working copy to truly reflect that foo/bar is deleted. To > paraphrase Johan from #3256, 'wh

Re: Unexpected tree conflict when deleting directory

2010-06-02 Thread Brian Pitts
On 06/02/2010 04:04 PM, Stefan Sperling wrote: Look at the output of svn info foo at this point. You'll see that foo is not at the HEAD revision, i.e. something older than 1740. foo/bar was bumped to the HEAD revision because it was a commit target. But foo was not a commit target so it is le

Re: Unexpected tree conflict when deleting directory

2010-06-02 Thread Stefan Sperling
On Wed, Jun 02, 2010 at 01:04:38PM -0400, Brian Pitts wrote: > Hi, > > I'm experiencing a tree conflict in a situation where there should be no > conflict. Basically, after removing the contents of a directory I'm > unable to commit deleting the directory even though no one has modified > it. The

Unexpected tree conflict when deleting directory

2010-06-02 Thread Brian Pitts
Hi, I'm experiencing a tree conflict in a situation where there should be no conflict. Basically, after removing the contents of a directory I'm unable to commit deleting the directory even though no one has modified it. The client is 1.6.6. I've tried with server versions 1.4.3 and 1.6.9. Below i