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

Re: Handling of locking between branches, using "almost binary" files

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-08-15 05:06:11 CEST

On Aug 14, 2005, at 9:38 PM, Kalin KOZHUHAROV wrote:
> Now if somebody wants to edit a .xls file in trunk/doc he has to
> lock it
> (using svn:needs-lock) to edit it. Everyone understands that and is
> happy about that.
> However, after developer K copies the trunk to branches/bug43534 and
> along fixing the bug changes a .xls file associated with it, the
> locking
> is of no use. Because developer K locks it's branch, and meanwhile
> developer A changes the same file in the trunk. Later, developer K
> cannot easily merge the .xls file to the trunk.
> Hope, I made the problem clear...
> Now, what about a solution?

If a developer creates a temporary, private branch to fix a bug,
create a company policy which requires that the developer lock the
unmergeable .doc/.xls files in the trunk. Then the developer can do
whatever s/he wants on the branch, then merge the branch to a working
copy of trunk which contains the lock-tokens, then commit (thereby
releasing the trunk locks).

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 15 05:07:27 2005

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.