On the SVN server, there is a file called config.conf
. I have a local version called the same thing (in the same place). How can I make sure that my loc
SVN will always think that that file is part of the repository if you name it the same and stick it in the same directory. Your options are
mv config.conf config.conf.theirs && mv config.conf.mine config.conf
and then run your app)When there is a subversioning with configuration files, i've found very useful to have an entire trunk dedicated to it. Why? Most because you can simply have two local repository copy, one for local uses, one for remote chanings.
Like this:
/workdir/configuration [ is a link to /workdir/conf_local ]
/workdir/conf_local [ keep local conf updated but doesn't ovverride my settings ]
/workdir/conf_remote [ always updated with remote data, so I can commit changes ]
as Scrappydog pointed out
You can use / create different lists in commit dialog box
it supports ignore-on-commit list, this way the files under this list will not be visible ..
you can refer to this blog link for details.
http://blog.baljeetsingh.net/2009/02/tips-tricks-svn-ignore-on-commit.html