version-control

Should I use Git for deployment of web apps?

I use Git to track local changes in my PHP web applications, and I was wondering if it would be a good idea to use Git on the server as well, so that I could just use git push to deploy my changes. Would there be any pitfalls with this approach? ...

Migrating from CS-RCS to Mercurial

I've been using ComponentSoftware's CS-RCS Basic for many years now to manage my various single-developer projects. It's worked very well for me, but now I want to migrate to a modern revision-control system, and after studying my options I decided on Mercurial. The problem is that I've always used a central repository for CS-RCS, and I...

git merging workflows

I found the following stuff from progit. I do not understand the portion in bold style. Could anyone kindly explain. The Git project has four long-running branches: master, next, and pu (proposed updates) for new work, and maint for maintenance backports. When new work is introduced by contributors, it’s collected into topic branches ...

Good introductory articles on revision control for students who are taking their very first programming class?

This semester I am teaching a lab at my university which is the first in a series on numerical methods for engineering students. The class is split into two parts: Linux and Programming Linear Algebra The downside of this split is that we have a little less that 7 weeks to introduce the Linux operating system and how to program in t...

Is there a way to tell what changes are in a central CVS repo comparing to my local working copy?

I need a way to figure out what files were added/removed/modified in the CVS repository comparing to my local working copy, i.e. what will happen to my local copy if I run "cvs update". It is safe to assume that I don't have any uncommitted changes in my local copy. The output of "cvs update" marks added and modified files as: U filena...

When to begin tracking projects in VCS?

I've been finding lately that often I will want to go off and hack at some new idea I have (as a new project), and if in an hour or so it looks promising, I will keep it. If not, I will trash it. My question, then, is when should I start tracking these little experiments? From the very beginning, like with hg init revolutionary_idea, or...

Pull remote SVN and merge local changes

Hi, We use WordPress for development, but often make a lot of modifications. We're looking for a way to always keep our development version up to date with our modified version. It possible to import all of the WordPress SVN commits, branches and tags, but merge these with any we've made in our repo. For example if we had removed the ...

Are there any web sites with a web scm command-line (for any of svn, cvs, git, hg, bazaar, etc.)?

Is there any web sites that exists with which you can do the same thing as an scm client? For example: checkout from a repository, commit stuff, etc.? With something like that you would not need to install a scm client on your computer. ...

subversion include directory exclude files

I want to include a directory when I do my imports but exclude any files that might be in it. how can this be done? ie: include cache dir, but exclude all the cache files in it. in my global-ignores I have tried cache and cache/*, the former just excluded the entire cache dir - expected. and the later included everything. am I clos...

How to block HTTP access to a Git repository?

I'm playing around with the idea of using Git for deployment and updates of my web applications, but the problem is that by doing it the way I'm doing it, the .git directory (and therefore all my source code) would be accessible via HTTP. This is what is holding me back from really implementing this idea. How do I prevent HTTP access to...

Perforce and Emacs

I'm looking to setup emacs to allow me to use perforce without having to use p4v. I've had a look at the emacs wiki and a search on the site but there only seems to be two options out there - both of which are pretty old. First option is p4.el which was last updated in 2004. The second option is the integration with emacs VC component,...

How to prevent Visual Studio from adding generated files to source control

Here's my specific scenario: Using VS2010, Pex and TFS2008, generated moles files are getting automatically added to source-control (TFS). Pex adds a "project_name.moles" file to your test project and then autogenerates 3 files at build time: project_name.Designer.cs, project_name.Moles.dll, and project_name.Moles.xml. I want to keep th...

Guidence on using a remote Git repository for teamwork.

I project I have been working on has now been split between me and another developer. I have created a Git respository at my client's host of choice, CodeBase, and both me and the other developer have been able to clone the repo back to our machines. He is not able to push back to the remote though. I would like some guidence e.g. adv...

Git GUI to checkout single file

I have several version of project stored under GIT.. Now my requirement is that I need to get one specific file from one of the previous version. Reading this forum I came to know that it can be done by Git Bash. Is there a way to checkout one particular file using Git GUI Thanks in advance ...

How to remove a file from version control without deleting it?

If I run svn rm file, the file is removed from the local working copy. What I do now is: $ cp file file2 $ svn rm file $ svn ci $ mv file2 file How avoid svn to also delete the local file and let it just remove the file from the repository? ...

Mercurial archive specific folder/files?

Hi, In SVN, I can do this to only export contents in folder2 svn export svn://source/Trunk/folder1/folder2 -r HEAD How can I do the same in Mercurial? It seems that hg archive only accepts the target path not the source path. If I do hg archive target_path/folder it will export everything in the repository. Thanks in advance. ...

Do you check in your rvmrc file?

Ruby Version Manager allows us to use an .rvmrc file in each project to set up which ruby version and gem set to load. Should this file be checked in to source control? Or does this presume too much about other developers' working environment? ...

Automatically mirror a git repository

One of the side-effects of using an external Subversion repository was getting automatic offsite backups on every commit. I'd like to achieve the same using Git. i.e. every commit to my local repository automatically commits to an external one so the two repositories are always in sync. I imagine that a post-commit hook would be the ...

What would be a good introdcutory tool to Clearcase ?

I am developer with more than 10 years of software development experience. I have joined a new shop which uses ClearCase and I would like to understand ClearCase. Any suggestions for a developer who has pretty good hands on the following SCMs Subversion : Perforce : written extensive build scripts integrating with perforce Mercurial ...

In hg, how can I drop the branch name when rebasing and/or transplanting from another repo?

Basically, what I want to try is pulling hg revisions from a branch of an experimental repo into a clone of mainline. But I want to discard the branch name so I can push directly into the server-side mainline repo. It's probably best to give a simple example: hg init hg_mainline pushd hg_mainline touch foo hg add foo hg commit -m 'fo...