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

Re: File lock issue

From: Henrik Sundberg <storangen_at_gmail.com>
Date: Fri, 2 May 2008 13:19:13 +0200

2008/5/2 Srilakshmanan, Lakshman <lakshman.srilakshmanan_at_police.vic.gov.au>:
> Hi All,
> I find that a file with svn:needs-lock creates an exclusive lock only in the
> branch I am working in.
> My understanding was that creating an exclusive lock was to ensure
> serialised update on files (eg word docs) because they cannot be merged.
> Is there any way of preventing changes across branches till the latest copy
> of the file is merged into the branch before editing or alternatively is
> there a way of informing users on different branches that the file has been
> edited and they need to update their copy before proceeding.

I find this troublesome. The needs-lock tries to solve two different problems.
From the book: "Users and administrators alike are encouraged to
attach the svn:needs-lock property to any file which cannot be
contextually merged. This is the primary technique for encouraging
good locking habits and preventing wasted effort."
Case 1: Avoidance of wasted effort. Needs-lock is a good name for this.
Case 2: File types which can not be merged. svn:unmergable might be a
better name for this.
OTOH: I think svn:needs-lock semantics could be extended to mean
unmergable as well. There has been discussions of forcing merge
conflicts for files. Couldn't this be the solution?


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-02 13:19:38 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.