version-control

Using TortoiseSVN from Multiple Computers with an SVN repo on External Hard Drive

With TortoiseSVN, I created a repository on my external hard drive, where I store all my code. I purposely chose to put it on an external hard drive so I can use it on multiple computers (take it with me from place to place). However, yesterday, I tried to checkout my code from my repository from a different computer (also running Tortoi...

Two programmers working on a Visual C# program

I and another programmer am working on the same program in Visual C#. I let him work on it, and then he uploads it and then I work on it, and then I upload it so that he can work on it. We take turns altering the source code. However, this is kind of slow. It would be better if we were able to both work on the source code at the same...

Rolling my own "Version Control"

I'm a hobby developer and i want to put my projects in some sort of version control. I've tried several version control systems (git i think, SVN, mercurial, bazaar) and they were a pain in the neck for one or more of the following reasons: There was no GUI interface The gui interface it DID have was clunky it plastered decals all over...

How to add files to file based repository?

I just downloaded Cornerstone and would like to add my existing files to a new repository. The repository will be file based (no server) and used by a single developer. In Cornerstone, I create a repository. It doesn't have any folders. I then select one of my existing project folders and import it. The folder imports but none of my...

Which SCM and Issue tracker to use for personal work?

I am planning to bring some "peace" (you may call it organization) to the personal work (small projects, etc.) I do at home. I would like to use a SCM and an issue tracker which can capture the commits and show them as changesets etc. automatically. Note that all the above softwares are supposed to be for personal usage so would prefer...

source control when starting up a new project

when starting with a project and using source control i find it hard to separate the things people are working on so they don't either write duplicate code or think it should be named one thing and so on. this problem diminishes over time because the general foundation is in place and it's easier to separate the tasks so they don't overl...

Simulating a global revision number with git

How would I go about simulating a global increasing revision number for every commit in the git main line? So, after I commit I would like a script to run increases a number somewhere. This will allow me to tell my customers easily that X feature was fixed in git revision XYZ. I am looking for a practical sample script that is robu...

File Revision Control

Hello guys, How can I add a revision history in a file like shown here. Just to keep it simple and clean. ...

How to setup a DotNetNuke Development Environment with Source Control?

My team is developing a new DotNetNuke web application and would like to know what is recommended to setup a development environment with source control and automated builds? We would like to keep the DNN source code separate from our custom modules and extensions source code. The DotNetNuke Compiled Module template for Visual Studio w...

heroku using git branch is confusing!

Ok, so I have a big github project that i'm not supposed to merge my little Stacia branch into. However, it seems like Heroku only takes pushing MASTER seriously. It looks like I pushed my branch, but for example if I only have my branch, it even acts like there's no code on the server. I can't even get my gems installed since the .gems ...

Team Foundation Build - resolving cross solution project references

We have a shared project referenced across multiple solutions which, when encountered by TF build causes: 'error MSB3202: The project file "......\trunk\\\sharedproject.csproj" was not found'. This is fine as the directory structure on the build server does not reflect that of source control. Is it possible to modify the build file...

Should I add the vcxproj.filter files to source control

While evaluating Visual Studio 2010 Beta 2, I see that in the converted directory my vcproj files have become vcxproj files. There are also vcxproj.filter files alongside each project which appear to contain a description of the folder structure (\Source Files, \Header Files, etc.). Do you think these filter files should be kept per-use...

How to add file to a previously committed changeset in Subversion?

After migrating from TFS to Subversion, we have found out that one of the files (a branch operation) of a changeset is missing. The tool that we have used implemented branching as delete and add operation separately and in this case it missed to add that file. After hundreds of revisions later we discovered the problem and fixed it imme...

Sharing git between different users

I currently have a git setup where git is a user on my linux box. /home/git exists and there are several git repositories in /home/git. The git user has a shell of /usr/bin/git-shell. If a user needed access to the repository, I'd just grab their SSH DSA public key and embed it into /home/git/.ssh/authorized_keys and they'd be able to wo...

Git: removing a file from being versioned, but not deleting it

I have a file which ended up being versioned in our repository but shouldn't have been. For arguments sake, the file is config.py. We instead version config.py.tpl but never the actual production config for the obvious reasons. What's the right way to stop versioning this file without deleting it locally from the working directory? Also...

How can a heavyweight checkout be changed to a lightweight checkout in Bazaar?

I have a shared repository like so: repo/ mainline featureA featureB I like to do all my development in one place, so I do something like > cd /Development/workingArea > bzr checkout featureA ... > bzr commit -m "Worked on featureA" > bzr switch featureB Over time, I've modified my feature branches to be treeless branches, as...

Remove project from SCM in Xcode

I have an iphone project on a mac. I set up an SCM repository and then ignored it for a while. Now I've decided to back up my source to my main PC and do source control there. I'm finding that the SCM wants to roll back my changes seemingly at random. How can I kill SCM in Xcode on the mac? I need to tell it to leave my source files ...

Mac version control with merge and support

I'm using a trial of Cornerstone and like the product but don't like the fact they have no support. Meaning, they never answer their email. I need a source control program that can handle merging through Subversion. Specifically, merging from a branch back into trunk. Cornerstone doesn't and from what I've read Versions doesn't eithe...

Bazaar + CruiseControl.Net

I want to setup CruiseControl.Net at my company. We currently have several .net solutions stored in a Bazaar repository and I want to use MSBuild to build each solution. This didn't seem too controversial, but I can't see an easy way of binding CruiseControl.Net to Bazaar. There seems to have been a plugin to do this at http://www.sorn....

Merging tag into trunk with Subversion

I have this folder structure: \myproject\branches\v1.2 \myproject\trunk I need to merge v1.2 back into trunk. v1.2 has revisions 104 and 105. Trunk goes from 57-65 and 106. The 106 revision is deleting a folder that doesn't exist in the v1.2 folder. My setup is file based. I've tried this in trunk: MacBook:trunk myuser$ svn merge...