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

AW: Tree conflict on locked file

From: Rast, Frank <Frank.Rast_at_gefeg.com>
Date: Thu, 13 Aug 2009 15:05:23 +0200

Hi Stephen,

thank you for looking into this.

It would be great to get a fix for 1.6.x.

Best regards,
Frank Rast

-----Ursprüngliche Nachricht-----
Von: Stephen Butler [mailto:sbutler_at_elego.de]
Gesendet: Donnerstag, 13. August 2009 13:45
An: Rast, Frank
Cc: users_at_subversion.tigris.org; Moser, Bernd
Betreff: Re: Tree conflict on locked file

Quoting "Rast, Frank" <Frank.Rast_at_gefeg.com>:

> Hi all,
>
>
>
> I am getting an unexpected 'tree conflict' when I do the following:

Hi Frank,

Thanks for the report. I get the same unexpected tree conflict using
Subversion trunk (pre-1.7).

I created a new test for trunk (r38718). When we fix the failing test,
we can probably backport it to 1.6.x.

Steve

>
>
>
>> 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].

-- 
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2383276
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-13 15:06:18 CEST

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