Tree conflict on locked file

Hi all,

I am getting an unexpected 'tree conflict' when I do the following:

>svn lock test.txt

'test.txt' locked by user 'XXXXXX'.

>svn delete test.txt

D test.txt

>svn update

   C test.txt

At revision 1.

Summary of conflicts:

  Tree conflicts: 1

>svn status

D KC test.txt

> local delete, incoming edit upon update

>svn --version

svn, version 1.6.4 (r38063)

   compiled Aug 8 2009, 15:25:21

Copyright (C) 2000-2009 CollabNet.

Subversion is open source software, see http://subversion.tigris.org/

This product includes software developed by CollabNet
(http://www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_neon : Module for accessing a repository via WebDAV protocol using
Neon.

  - handles 'http' scheme

  - handles 'https' scheme

* ra_svn : Module for accessing a repository using the svn network
protocol.

  - with Cyrus SASL authentication

  - handles 'svn' scheme

* ra_local : Module for accessing a repository on local disk.

  - handles 'file' scheme

* ra_serf : Module for accessing a repository via WebDAV protocol using
serf.

  - handles 'http' scheme

  - handles 'https' scheme

Without getting the lock there is no 'tree conflict'.

Is this behavior correct? What is the reason for this?

I want to achieve that no one works on a file that I plan to delete
until I commit.

Could somebody please look at this?

Thanks,

 Frank Rast

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2383212

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-13 11:16:31 CEST