Bill K
Bill K

Reputation: 62769

SVN config-file Question revisited

I searched and found this question but did not like the answer.

Is there another way to get SVN to ignore config files that are checked in in-place (that you cannot check-in changed), but must be modified on your system.

This is a pretty severe failure of SVN, my first disappointment with the system actually. What I'm hoping for is that someone out there figured out a trick, perhaps with branching just the config files onto a new branch while leaving everything else pointing at the original branch. Perhaps modifying the .svn directory?

There must be a better solution then template/copy, that seems so unmaintainable.

Upvotes: 0

Views: 1232

Answers (2)

Nic Wise
Nic Wise

Reputation: 8129

We get around this by:

All dev machines are consistent. We all develop out of c:\projects\TopGear\trunk... We all alias our SQL server to PROJECTNAME (eg TOPGEAR). We all use the same IIS hostname (TopGearDev)

And our NANT deployment building script rewrites all the config's, as needed, when we do a deployment, so we never need to worry about the settings - all the relevant ones are rewritten.

Added bonus: build servers (we use TeamCity) are trivial to setup.

It's bitten us once or twice, minorly, but has otherwise been good.

Not SVN specific (tho we are using SVN), tho.

Upvotes: 1

Bill K
Bill K

Reputation: 62769

After messing around for a few hours I think I have an answer. Since it's my own question, I guess I'll make it community wiki...

I created a branch of the entire repository and pointed the "Config" type files at the new branch, then checked them in.

I'm not sure how this will play out, but it made the "Check everything in" stuff work correctly. I think if I change one of those files it'll work fine, checking it into my local repository.

The only thing that could be annoying is if someone else changes a file that I have branched, I'm not sure how I'll identify the fact that I'm supposed to merge.

Upvotes: 0

Related Questions