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

Re: Is there a way to do an exclusive edit on a file?

From: Glenn Maynard <g_sub_at_zewt.org>
Date: 2004-05-09 10:01:15 CEST

On Fri, May 07, 2004 at 03:44:47PM -0500, Ben Collins-Sussman wrote:
> I don't know squat about VC, but perhaps these files shouldn't be kept
> under version control?

Moving things out of the build tree is (in my experience) rarely a
practical solution, even for unmergable files and files that don't change
very much. Having build instructions that look like "download this svn
tree, then extract this tar into this specific place to get the rest of
the files, and watch the mailing list just in case they do change, and
mail me changes if you really need to change them" don't work very well. :)

However, I've never seen VC shuffle a .vcproj file around, which is
usually the most commonly-changed file in a VC7 workspace (containing
the actual file lists). I *have* seen svn fail to merge it in cases
that seemed trivial: a few blocks of XML added, and it created a whole-
file conflict that had to be merged by hand. I havn't got around to
investigating this, yet.

(I have seen VC6 generate different output for the same project file--a
bunch of random things will change depending on who commits the file,
probably based on the version of the IDE.)

Glenn Maynard
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun May 9 10:01:46 2004

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.