version-control

How do I export (and then import) a Subversion repo?

I'm just about wrapped up on a project where I was using a commercial SVN provider to store the source code. The web host the customer ultimately picked includes a repository as part of the hosting package, so, now that the project is over, I'd like to relocate the repository to their web host and discontinue the commercial account. How...

How to recover a deleted branch in TFS?

I deleted a branch in TFS and just found out that I need the changes that were on it. How do I recover the branch or the changes done on it? ...

Git ignore file for Xcode projects

Which files should I include in .gitignore when using Git in conjunction with Xcode? ...

Re-Running Database Development Scripts

In our current database development evironment we have automated build procceses check all the sql code out of svn create database scripts and apply them to the various development/qa databases. This is all well and good, and is a tremdous improvement over what we did in the past, but we have a problem with rerunning scripts. Obviously...

Is there a barebones Windows version control system that's suitable for only one guy?

Hi everyone, I'm trying to find a source control for my own personal use that's as simple as possible. The main feature I need is being able to read/pull a past version of my code. I am the only developer. I've looked at a lot of different version control systems, but they all seem way more complicated than I need. I need one that's ...

Source Control for Everyone?

I've got a number of non-technical users that all share a set of project files. It would be ideal to have them using version control, but I think that both subversion and git are too technical for non-technical office staff. Is there any distributed source control software that would work well for normal people? ...

How to repeatedly merge branches in Mercurial

We're using Mercurial where I work and I want to have a setup similar to how I used SVN: Trunk Tags Production Branches Since Mercurial supports branches natively, I know how to create a named branch, but I can't find any documentation on how to repeatedly merge 'Trunk' with 'Production'. Quite simply, I want to have a developmen...

How would you organize a Subversion repository for in house software projects

I work for a company whose primary business is not software related. Most documentation for using source control is written with a development team writing for commercial or open source projects in mind. As someone who writes in house software I can say that work is done differently then it would be in a commercial or open source setting...

How do you treat legacy code (and data)?

I am currently in the process of restructuring my local Subversion repository by adding some new projects and merging legacy code and data from a couple of older repositories into it. When I have done this in the past I have usually put the legacy code in a dedicated "legacy" folder, as not to "disturb" the new and "well-structured" co...

Finding unused files in a project

We are migrating our works repository so I want to do a cull of all the unreferenced files that exist in the source tree before moving it into the nice fresh (empty) repository. So far I have gone through by hand and found all the unreferenced files that I know about but I want to find out if I have caught them all. One way would be to ...

How to setup GIT bare HTTP-available repository on IIS-machine

Hello/ My build-server already runs IIS to serve 80 and 443 port over TCP. I want to make centralized "push/pull" GIT repository available to all my team members over the Internet. So I should use HTTP or HTTPS. But I cannot use Apache because of IIS already hooking up listening sockets on 80 and 443 ports! Is there any way to publis...

Creating a Patch with TFS

Creating a patch is very easy in SubVersion, With Tortoise, you right-click and select Create Patch. But for the life of me, I can't find this functionality in TFS. Is this possible? If not, what's the standard way to submit patches in open source TFS hosted projects (a la CodePlex)? ...

Ignore SVN ignore... possible?

So I have some files I want to ignore in a subversion repository, but I don't want my ignore patterns for this to be propagated to the repository. In other words, I added some private files in my checkout that I want to keep, but they only exist for me and wouldn't make sense to be ignored for everyone, so if I use the svn:ignore, this ...

Is Subversion (Version Control) Necessary For A Small Development Group (1-2 programmers)?

I am trying to debate the point that version control is important for either one or two developers. More specifically, I work in a department in which there are typically two PHP developers, using a shared framework. He argues that there is no value added in us having Subversion installed on our development system, whereas I argue th...

Automating DB Object Migrations from Source Control

I'm looking for some "Best Practices" for automating the deployment of Stored Procedures/Views/Functions/Table changes from source control. I'm using StarTeam & ANT so the labeling is taken care of; what I am looking for is how some of you have approached automating the pull of these objects from source - not necessarily StarTeam. I'd l...

How do you make a build that includes only one of many pending changes?

In my current environment, we have a "clean" build machine, which has an exact copy of all committed changes, nothing more, nothing less. And of course I have my own machine, with dozens of files in an "in-progress" state. Often I need to build my application with only one change in place. For example, I've finished task ABC, and I wa...

Cross-Branch merging in TFS?

Is it possible to merge to a branch that is not a direct parent or child in TFS? I suspect that the answer is no as this is what I've experienced while using it. However, it seems that at certain times it would be really useful when there are different features being worked on that may have different approval cycles (ie. feature one mi...

Separating CSS deployment from rest of site

Where I work, the design and development departments are totally separated, however we (the design department) are responsible for managing the CSS for our sites. Typically, new CSS needs to be released to the production server far more often than new website code. Because of this, we are deploying the CSS separately, and it lives outsid...

Can you "ignore" a file in Perforce?

I sometimes use the feature 'Reconcile Offline Work...' found in Perforce's P4V IDE to sync up any files that I have been working on while disconnected from the P4 depot. It launches another window that performs a 'Folder Diff'. I have files I never want to check in to source control (like ones found in bin folder such as DLLs, code gen...

What, if anything is typically done in a repository's structure to reflect deployed units?

This is a follow-up to the question Should the folders in a solution match the namespace? The consensus on that question was a qualified "yes": that is, folders == namespaces, generally, but not slavishly (the way java requires). Indeed, that's how I set up projects. But setting up source control has made me hesitate about my current...