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

Re: Team development issues

From: Ryan Schmidt <subversion-2008b_at_ryandesign.com>
Date: Mon, 21 Apr 2008 17:06:28 -0500

On Apr 21, 2008, at 10:02 AM, Scott Sharkey wrote:

> I have a team of web developers working off a common base of code
> which is managed in a subversion repository (cake-php app). We do
> have a development server, with each developer having an account
> there, but some of the developers (for various reasons) prefer to
> work on their local environments (both Windows and linux). The
> problem that I'm having is that the application uses several
> configuration files, and .htaccess files. Sometimes, these
> configs/.htaccess files require local modifications to work in the
> local developer environment.
>
> If I mark the files to be ignored, then a new checkout of the
> application is non-functional, since there are no configs, and more
> importantly, no .htaccess files. Recreating them is non-trivial.
> But if I don't ignore them, then any local developer doing a checkin
> overwrites the "common" case files with their local modifications,
> which are NOT necessary in a "production" rollout.
>
> What I've done so far is to rename each of the config files from, say
> core.php to core.php.default, and the .htaccess to .htaccess.default.
> Then, the user is required to copy the default files to the actual
> files in order to make a working application. I then set SVN to ignore
> the non-default files. I suppose I could write an installation
> script to rename the .default files if it became necessary.
>
> Does this make sense, and is there a better way to address the
> problem?

Yes, that makes sense, and is exactly what's recommended for this
scenario:

http://subversion.tigris.org/faq.html#ignore-commit

There isn't a better way to address the problem, except perhaps to
automate the required copying for the default files. For example, put
a setup script in the working copy somewhere, and instruct developers
to run that after checking out a new working copy. The setup script
can do all the necessary copying of config files or .htaccess files,
and maybe even automatically modify them for the user's environment.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-22 08:31:16 CEST

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