version-control

How to migrate/convert from SVN to Mercurial (hg) on windows

I'm looking for a tool to migrate a couple of SVN repos to Mercurial, with history, labels and so on. I'm Using TortoiseHg (Windows x32), so ConvertExtensions are discarted. There's some info on how to do this process on a Linux box (hgsvn) I don't have a Linux machine available. Can I use those python scripts on windows? If so, wha...

Git: how is a branch I'm not committing to ahead of origin/master

Hi all, I work 100% with a branch that I made off of the master branch. Now that a colleague has pushed back to origin/master, I tried to push those changes into my personal branch. When I do a 'git checkout master' followed by a 'git status' I get the following: # Your branch is ahead of 'origin/master' by 2 commits. How is a branch...

Good comments on changesets in sourcecontrol

We need to develop guidelines for writing comments when we register code in version control system (such as TFS). E.g., when we submit a bugfix, we create a comment "Fixed bug #..." We tried to brainstorm on this topic, but most of the ideas bring too little added value. I would appreciate any suggestions for this. ...

What options are available for doing Source Control in SQL Server 2005 / 2008?

Title says it all really. What software is available for enabling Source Control in SQL Server 2005 and above. What are the downsides of doing Source Control in SQL Server if any? ...

How to setup TeamCity under IIS?

Any ideas? ...

What are some best practices for maintaining multiple versions of a project?

I've got a project where we're rolling out v1, and beginning work on v2. I'm afraid that we're going to see bug fixes and minor feature changes to v1 over the next few months, some of which we're going to need to roll into v2, some of which we're going to need to keep separate. (We need to maintain v1's major feature set, but fix any bug...

Whats the easiest way to setup a local subversion server?

I'm really not well versed in these things, I just want to setup an svn server locally on my computer. Also I'd like to set it up and integrate it directly into Visual Studio 2008 if it's possible? thanks for any help! ...

Best Practices for version control with multiple projects

I have several projects with a very large over-lapping code-base. We've just recently started using SVN so I'm trying to figure out how I should be using it. The problem is that as I'm finishing a task on one project, I'm starting a task on another, with some overlap. Often there's a lot of interrupt driven development as well. So, my c...

Migrating from clearcase to mercurial

What tools are available to migrate from clearcase to mercurial? Is it possible to move history? What kind of limitations are there? ...

Reasons to use Subversion over MS Source Safe

Hi I am in the following predicament, i currently use Subversion for my source control and love it. The problem is that i have to (in the near future) hand over my project to another group of dev's to maintain while still working on it my self . The problem is that they have never heard of or used Subversion and only use MS Source Safe....

Is assigning a ticket number to a checkin with version control worth the effort for developers?

The practice I'm discussing is: Your project/product has a ticketing system for bugs, features, etc. There is also have source control. However, it always seems that there is a reason to try to tie these two together. Some places don't want a checkin without a ticket number. Some development shops are looser about the requirement that th...

Identify the correct tool for developers, based on real needs

I will start with a little background for perspective to the question, what legitimate questions can I pose in order to identify the correct source control tool for the real needs of my development teams? The developers have used ClearCase since an IBM consulting lead project team installed it for use during a large in-house project. ...

Deploying only changed part of a website with git to ftp (svn2web for git)

I'm having a website with many big images file. The source (as well as the images) is maintained with git. I wish to deploy that via ftp to a bluehost-like cheap server. I do not wish to deploy all the website each time (so that I won't have to upload too many unchanged files over and over), but to do roughly the following: In a git r...

Merging and branching shared code between projects in TFS

I'm currently in charge of migrating our asp.net applications from source safe to TFS. We have three or four very similar apps (let us say e-commerce) that currently share a core library (services, business logic, entities, data access etc). The applications are similar but not identical so one app might get a feature set the others wo...

Best way to reference an external library in multiple projects in a Visual Studio solution

We have a Visual Studio 2008 solution under VSS source control. The solution contains many class libraries, many of which need a reference to an assembly that is not part of the solution. Currently we are keeping separate copies of that assembly in each project but as the number of projects grows it gets increasingly tedious to copy in u...

Has anyone successfully migrated VSS 2005 over to SVN?

I've been playing around with SVN for the last little while and have come to love its power and user experience and that we can tie it into our bug tracking system to simplify everyone's lives. So it's come to the time that we've decided to migrate our VSS 2005 setup across to SVN and I am now coming unstuck. It seems there are a numbe...

Using Git to track Ruby on rails

Other than the database and log files are there any other files that should not be in the repository for security reasons? The project will mostly be worked on by myself however the code is to be stored on a shared repository which will be available to a few other users should they want to pull from it. The project is reasonably simple...

Merging GUI changes

In the projects I work in, it seems the biggest problem with Merging changes is in the Windows Forms/GUI changes. We use Araxis Merge to compare the changes, but it can be hundreds of changes per file. And you have have to make notes and/or rename items to make sure you know what you are merging. A big problem is if developers allow n...

Subversion - dealing with code generation

We have a web application framework that we want to use with Subversion. We've tried a couple of times before to set it up, but the code generation part of our application is causing problems. The problem is that the generated code from one developer can be in a newer file than from another developer, but the content of the newer file...

Find SQL objects missing from source control

We use Source Safe and are migrating to Source Gear. We know that we have sql objects (procs, triggers, views, functions) that are in sql but were never added to the source code repository. What is the best way to hunt those down so I can add them? ...