version-control

Project files under version control?

I work on a large project where all the source files are stored in a version control except the project files. This was the lead developer's decision. His reasoning was: Its to time consuming to reconcile the differences among developers' working directories. It allows developers to work independently until their changes are stable I...

Is there a good SVN tool to easily view past revisions?

Source control is great. One of the nice features is that I know that I can go back to previous revisions in case something messes up. However, I still find myself loathe to delete a large batch of code that is no longer necessary, but that I might want to use parts of in the future. It really has no business in the current code base. ...

Is there anyone out there using Clear Case with Sybase Powerbuilder?

Word has come from upon high to standardize our SCM system. And upon the clay tablets was written Clear Case. I am reaching out to anyone who is actually using this configuration - to get best practices, hints and tips, war stories, anything... The Sybase Source Control newsgroup only gives back the sound of crickets. We currently h...

iPhone, XCode and Source Control

Hey, Up until recently I was working alone on all of my iPhone project code. I recently added another member to my team and was wondering what's the best way to work on the same project together? Where to put the actual code online (right now we're using dropbox)? Which source/version control tools are best to use with small teams worki...

Ideas For Version Number Control

Here's the development environment we're looking at: Primarily .NET (C# mostly) Development in Visual Studio 2008 Source control in SVN (VisualSVN server, Tortoise client) Deployments with MSBuild/MSDeploy controlled by Rake scripts What we'd like to start having is some kind of tracking of version numbers in deployments. The main r...

Mercurial - Copy latest revision to an arbitrary folder on commit if commit happens on a certain named branch (hook)?

I have a mercurial repository setup with a few named branches. I want to check if a commit occurs into a named branch of a certain name, and then push a copy of the head revision of the named branch to a "publish" folder. Example: Bobby commits a change to the "Development" branch. The script sees it was commited to the "Development" ...

How to get 3-way merge in GIT on non-conflict merges?

Hi, How to disable auto-merging in GIT? The purpose is to have the same behaviour as for conflict merges resolution in automatic merges during invocation of command chain: $ git fetch $ git merge some_branch $ git mergetool The last command leads us to 3-way merge of files in case of merge conflicts. I would like to have an easy way...

TortoiseHG: undoing commit that fails

I've been using TortoiseHG for some time now and I've been running into the same issue once in a while. Sometimes, when I commit my work, it gives me an error, saying that one (or more) of my files is being used by another process. However, the commit still goes through and is visible in the repository browser. Next, after closing the ...

WebDAV and version control

Does anyone have any insight into what, if any, provisions the WebDAV protocol makes available for version control? In my never-ending pursuit of a good way to integrate designer tools like SharePoint Designer or Expression with a real source control (which must support live preview), I'm about resigned to the idea that I'll have to wr...

Is there a revision control system that allows us to manage multiple parallel versions of the code and switch between them at runtime?

If I want to enable a new piece of functionality to a subset of known users first, is there any automated system of framework that exists to do this? ...

Is there a sourcecode management system (svn, git, etc.) webclient that can commit?

Is there a sourcecode management system (svn, git, etc.) webclient which you can use to change the code? (without ruining the system), I am hosting at sourceforge. ...

Database records revision

Hi, I have to questions concerning database records revision. First of all I have database table with name and content columns. I want to have "backup" versions of the content (and maybe name) column saved plus the user, who made this edit. Is it better to have an audit table with previous versions (and should I keep only the changed co...

How do you manage databases during development?

My development team of four people has been facing this issue for some time now: Sometimes we need to be working off the same set of data. So while we develop on our local computers, the dev database is connected to remotely. However, sometimes we need to run operations on the db that will step on other developers' data, ie we break as...

CVS export inside a module

I have a checked out a module. It's in /home/user/repositories/repository. I want to export a folder inside this module. Suppose it's folder3. /home/user/repositories/repository/folder1/folder2/folder3/ I get into /home/user/repositories/repository/folder1/folder2/ and try to run cvs export -r MYTAG -d MY_DIR folder3 But it d...

List all tags within a module in CVS in CLI

Is it possible to get a list of all generated tags for a given module in CVS? I can use cvs status -v FILE but it shows too much information that I just don't need. I can use some gui utilities that show me only the tag names (Eclipse is one of them), how do they do it? You need to do some "hacks" or are just parameters I'm unaware ...

cvs checkout -c doesn't show all modules

I have a module in my repository. Let's call it module1. If I just checkout it, it's alright, it shows up in my machine and I can work on it. There's a parameter in checkout command named -c - according to help, '"cat" the module database.'. But when I run this command cvs co -c The module isn't showing up. Why? Is there a cache fi...

Using git below web root in production.

I'm an avid git user; I use git in development; in staging, but not in production. Are there any good reasons not to use git below the web root (/var/www/) in a production environment? I've been considering either using the master branch as the production branch, or creating a production branch. push production master sounds so nice....

When do I check out TRUNK vs the FULL PROJECT in an SVN repo?

Hi All, Got a (hopefully small) question regarding SVN and checking out repos. Basically I see conflicting tutorials and suggestions regarding what to check out and when. Some will say: svn co http://my.repos.com/project my_project …while others say: svn co http://my.repos.com/project/trunk my_project When would I want to grab...

Managing and deploying code between dev/preprod/prod

hello... We have a fairly large java web app and all new features, bug fixes, etc. are being managed manually... This is becoming a very tedious task to keep track of everything that has changed and then move them from dev to pre production and finally to production so we are looking for a way to better manage this. Obviously we need to...

Any source control tool that can manage code kept on FTP Folder?

I have bought hosting space from some third party provider. Now I am thinking to use some of the space for source control management. On searching the net I have found VSS does not support FTP folders. Is the any tool that can be used for source control over ftp? ...