version-control

Distributed Version Control "killer applications"

Considering switching to Mercurial? We are too. I'm currently studying the benefits of DVCS which turn out to be vast, lust and must. I would love to hear from the community typical usage patterns. Let's create a "Top (te)N" productivity feature list for DVCS (based on Mercurial, or alike). Please describe work flows that prove to be...

Migrate a folder from repository to another repository, with all the changes tree data

I have a folder in a mercurial repository, that I want to copy to another mercurial repository, but with all the changes that I made to this folder, and without losing the all version control that I did on this folder. Is that possible to do with mercurial? ...

How to view who has a file open on Windows fileserver

I was contemplating moving to a version control system at work, but the learning curve may be too much for the many copywriters that open simple html files and editt them on our shared development server. The main issue is that sometimes two people will work on the same file (on our development server) at once and overwrite each other. ...

Using Versions and SVN

I've set up an SVN repo and I've downloaded the free version of Versions. Now, how do I get started with Versions? I get an error when I try to create a repo bookmark. ...

Program development

Hi, I am writing a C program. What I have seen from my earlier experiences is that I make some changes on a correct version of my program, and after that change, the program is computing incorrectly. Now, for one occasion it may be easy to detect where I made that change and undo it or do it in some other way, and for other occasions I...

Choosing version control work flow

I have been tasked with researching how to improve the way my company handles version control. Background Currently we use Borland StarTeam, which has some issues. Apart from often being difficult to use, the number of tools (IDE support, code review, ...) which support it is very low. Our company has something like 40 developers but ...

Recommended Development practices for working with Siebel CRM?

I may be working with Siebel CRM soon, and I'm looking for advice on using modern development practices and enterprise best practices. Specifically I'd like advice on the following areas: How should we set up version control (specifically with Subversion)? What kind of structure should our repository have? How should we handle branc...

SVN show files in working directory which are out of date

I am playing around with SVN trying to get a better feel for how it works. I added some files to my repository and checked them out into 2 separate working directories. For working directory 1 I am using my SQL client software (Aqua Data Studio) to modify the file and working directory 2 I am just using Windows Explorer with TortoiseSV...

Clearcase - Find out when view was created

We have many old snapshot views lying around and I need to find out when these snapshot views were created. There is a twist - we are no longer running ClearCase and the hardware we used to run it is no longer around. However, we still have all the files used internally by ClearCase still lying around, so I can go to a directory /usr...

Which Visual C++ file types should be committed to version control?

Which Visual Studio \ Visual C++ file types should be committed to version control? In my project I have the following file types: aps cpp exe filters h ico idb ipch lastbuildstate lib log manifest obj pch pdb rc rc2 res sdf sln tlog txt user vcxproj I would greatly appreciate a short reasoning for each. If any of them are controversi...

For binary files should I use bfiles or bigfiles?

There are a few mercurial extensions for dealing with large binary files. Bfiles BigFiles Snap others? I'd like to use the one that is most likely to be official (ie distributed with mercurial). Kiln 2.0 uses a fork of Bfiles for its binary files. Does that make it more likely to become official? Which is the preferred (semi-offici...

Help setting up Bazaar Explorer between my VS2008 working directory and my dev web server

All I want to do is setup it up, so that after I make changes in VS2008 (local machine), I send those changes to the dev server. Also, I would like it so my other coworkers can do the same. But I don't seem to be able to get this working. Please help! ...

Version control for other kinds of files? (non-source code files)

Version control in programming is pretty much a necessity, and some programs allow for things like change-tracking or a form version control for files other than source code (like MS Word, InDesign, etc.). Is there any kind of system or architecture/protocol that could be put in place to establish version control for non-source code fil...

Is replacing strategies injected via a DI container a valid deployment mechanism?

I'm creating an application which uses a DI Container for injecting strategies into it. When deployed, if I require those strategies to change, is it a valid deployment strategy to deploy a new assembly with the new strategies and ammend the configuration file for instructing the DI container of which strategy to use? My concern is that...

Best practice on folder layout in revision control?

Hi, I'm just coming into a company on what is essentially my first gig as a team member rather than the sole Windows developer, and I'm not liking the current version control setup. We're developing for Windows machines using VB.net at the moment, with live software dating back to VS2005, being updated to newer Visual Studio versions a...

Manage code across multiple SVN repositories (online hosted and internal)

We have a very large existing site that we're going to do a completely brand new build for. Our client has their own hosted SVN repo they've paid for which we use to commit and update our working code. As a dev shop, we have our own SVN repo internally. I'd like to get this new build of the site in both the client's hosted SVN as well as...

SVN - reviewing changes made by a specific person

I have two programmers who make changes to the same project. Their commits interchange, but they mostly work on different parts of the project (although very often they modify the same files): Commit 1 - Programmer A Commit 2 - Programmer A Commit 3 - Programmer B Commit 4 - Programmer A Commit 5 - Programmer B Commit 6 - Programm...

What is the best version control practice for this situation?

I'm taking a programming course. I did my first assignment in an HG repo called Assignment1. Now the second assignment is out, and it appears that I'll be able to use large chunks of code from Assignment1 as a base for Assignment2. A few options I see are: Copy and paste the relevant code; create a new repo for Assignment2 Continue c...

How do I import a new release of a project into my git repository?

My repository looks like this. v1 - A - B - C ... where the commit v1 represents the contents of upstream-project-foo-0.9.8.tar.gz and the commits A, B ... are my modifications. The goal is to upgrade my copy of upstream-project and port the commits A, B, C ... to it. How do I get a new version of the upstream-project tarball into m...

Committing to two remote projects from Git.

I have a project in Codeigniter, managed via Git and Github, that consists of my 'boilerplate' customizations and libraries (like a centralized Render library) that I use for all of my CI projects - let's call that 'Baseline'. At the same time that I'm developing and refining the Baseline CI project, I'm also developing the current cl...