version-control

What do you do if a feature is dropped at the last moment?

Let's say you work on a large project with multiple features targeted in each release. We may have different feature branches (in the VCS) for each feature development. But after all the feature branch is merged and integration is done say one of the feature is dropped (this happens more frequently in our organization than you would imag...

git workflow incorporating many, but not all commits from many forks

I have a git repo. It has been forked several times and many independent commits are made on top of it. Everything normal, like what happens in many github hosted projects. Now, what exact workflow should I follow, if I want to see all that commits individually and apply the ones I like. The workflow I followed, which is not the optima...

How to rebase one repo to another

Let's say I have two different repositories like so: Project 1: Init---A---B---C---HEAD1 Project 2: Init---D---E---F---G---HEAD2 Is there a way to rebase Project 1 (Init to HEAD) to the Init commit of Project 2 so it looks like this: Project 1 & 2: A---B---C---HEAD1 / Init---D---E---F---G---HEAD2 The content of Project 1 &...

Searching for a document format.. flowing layout + page control

I am bouncing around the idea of creating a custom document versioning system to use on business rule manuals. These manuals are broken up into outlined sections which contain one rule per section which are outlined in various ways (1.1, 1.2, etc). There are many manuals which contain the same rule for different locations in the country ...

Visualise Workflow Diagram from plain text

Assuming there is a plain text with description of the workflow (Just plain English in some predefined format). Are there any tools (better online) to visualize the flow based on a plain text? What for: to store the description of the workflow in a source control system and be able to quickly remember/understand that. ...

SVN Source control issues when merging changes

I have seen where changes have been made on one code file by two developers code like this: x++ End up like this: x++ x++ where due to carriage returns being inserted/removed (I think) one line has become silently merged as two lines of the same code (no conflicts) Everything compiles but suddenly tests are failing and weird behavi...

Is it possible to exclude some files from checkin (TFS) ?

We use configuration files within various projects under source control (TFS), where each developer has to make some adjustments in his local copy to configure his environment. The build process takes care about replacing the config files with the server configuration as a part of the deployment, so it doesn't actually matter what is in ...

Error number 13 - Remote access svn with dav_svn failing

I'm getting the following error on my svn repository <D:error> <C:error/> <m:human-readable errcode="13"> Could not open the requested SVN filesystem </m:human-readable> </D:error> I've followed the instructions from the How to Geek, and the Ubuntu Community Page, but to no success. I've even given the repository 777 permissions. ...

What are some of the largest open source software projects with substantial revision and bug tracking history?

For my Honours project at University this year I'm considering doing some research into which code metrics are useful in predicting where defects are likely to exist in code and what metrics map to what kind of defects. What large open source projects exist that have a substantial revision history and also use a bug tracking system? ...

Version control for Microsoft Access development?

We recently saw this post: http://stackoverflow.com/questions/187506/how-do-you-use-version-control-with-access-development We then wrote a .vbs script from the example in that post to decompose a .mdb MS Access file. Problem is, when I run the script against the .mdb file, i get an error: decompose.vbs(71, 5) (null): Microsoft Offi...

How to add file revision (not the last changed revision) to Subclipse "Label decorations"?

Firstly, please beware I'm new to SVN. Then, my question has much in common with Get current revision number in Subclipse?. The (seeming) problem is (I use Ecpilse v3.5.0 (build id I20090611-1540)): My freshly installed Subclipse plugin offers "revision - last revision loaded into workspace" label under "Windows > Preferences > Team...

How do I embed Mercurial tags into my C/C++ code?

Hi, I would like to know if there is a way to embed Mercurial tags into my C/C++ code. Basically I would like the tag string, which will end up being a release number (major.minor.rev), to be automatically inserted in a determined location of my C code as a static string. The overall objective is that the application could be querie...

Import Xcode project into SCM / Subversion without duplicating project

Is there any way to click on something that Adds whole project to SCM/Subversion and also makes it a working directory by adding .svn folders? I create an XCode project as usual. Is the any way to just get Xcode to add the project to Subversion without import and checking out to a separate folder. My problem is that I have a /Dev folder...

Compare folders and export modified files

Hi, I was wondering if anyone could help me with the following. I work remotely with other software developers on the same project. I use subversion and tortoise to manage my code. I don't think the other developers do the same. This creates problems when we try and share code, because we have to figure out which files were modified so ...

Source Control best practice - periodically updating your working copy from the repository

(Note: This question is not specific to Subversion - I'm just using it here as an example.) I know that the "svn update" command (or whatever the similar command is in other systems) will update your working copy with any changes to files from the repository. I also know that it's a best practice in source control to periodically do a...

SVN - Checked out copy cannot be committed: 'not a working copy'

Hello, I've just set up Visual SVN Server and slik SVN clients. I imported a project from my desktop computer into the repository. Then, on my laptop I checked out a copy and made some changes. When I tried to commit, it failed saying it was not a working copy. I thought maybe I had somehow messed up the svn files, not sure how I woul...

Which svn client to install on Windows 7 machine?

I just got a new PC running Windows 7 (64-bit). I'd like to install an SVN client (command line only, I don't want TortoiseSVN). I'm not sure which of these to install: http://subversion.apache.org/packages.html#windows does anyone have any opinions on this? I tried going for the ones hosted by Tigris, but the downloaded zip says to ...

What are Git and Subversion all about?

I see a lot of sites referring to git, github, svn, subversion etc, but I never really knew what all of those things are. I also hear a lot of terms like 'svn repo', 'commit', and 'push' - I tried googling but it seems that I have so little knowledge about the subject that I don't even know where to get started. Could someone give me th...

If you need only version control and bug/issue tracking, is TFS too much?

We are a small Microsoft shop with 4 developers. We like the idea to have everything integrated and under the same SQL database but not to deal with too many features or a complexity we don't need. The other option would be to use two distinct third party tools. We also wonder if VS2010 version control and bug/issue tracking capabilitie...

managing Sql Server databases version control in large teams

For the last few years I was the only developer that handled the databases we created for our web projects. That meant that I got full control of version management. I can't keep up with doing all the database work anymore and I want to bring some other developers into the cycle. We use Tortoise SVN and store all repositories on a dedic...