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

Locking files across branches?

From: Gale, David <David.Gale_at_Hypertherm.com>
Date: 2006-05-02 17:43:29 CEST

What's the best practice for dealing with modifying binary files when
using branches?

That is: because binary files don't merge gracefully in general, it's a
fairly standard recommendation to use svn:needs-lock to force
single-developer modifications to a file. If, however, someone creates
a branch, locking a file in trunk doesn't lock it in the branch (which
makes sense, as there's no real significance to the trunk/branches
directories, so svn can't do anything useful). This would allow
modifications to be made both in the trunk and in the branch, causing a
massive conflict headache when the branch is merged back into the trunk.

Is there any good way of avoiding this?

Specifically, we're looking at a large, multi-month project that will
likely involve changes to a large percent of our code base, including
various binary files; while this is going on, it's very likely that
we'll get requests in from our current users to make small modifications
to some of those same binary files. When the multi-month project
completes, we'll be merging all of those changes into our production
code. We don't want to lose any of the minor modifications to the
binary files that happen in the meantime. Do we have to do all of the
minor modifications twice--once in the production code, and once in the
branch? This doesn't seem friendly, but it's the best option I can
think of.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 2 17:45:05 2006

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.