version-control

Database Versioning - How does branch switching work?

This is a question for those of you developing on a team of devs where all of you have separate databases. You're versioning your database using source control and other tools which will automatically bring dev databases up to date to the latest version of the database (schema, data, SP's, functions, etc.). OK Great! But wait! What if ...

Difference between HEAD / Working Tree / Index in Git

Hello, Can someone tell me difference between HEAD / Working Tree / Index in Git? From what I understand, they are all names for different branches. Is my assumption correct? EDIT: I found this "A single git repository can track an arbitrary number of branches, but your working tree is associated with just one of them (the "current" o...

storing Interop AxInterop dlls in source control

Hi all, I have recently inherited a C# .NET solution in VS 2008, .NET framework 3.5, with many 3rd party dependencies including several on COM dlls. I checked out the latest from the source control system and found I had to generate the Interop, AxInterop dlls in Visual Studio (adding references and adding them to the Toolbox and draggi...

Recommendations for version control software

In my day job, we use Visual Source Safe for version control. In my moonlight software development, I haven't as yet committed to a version control product. I'm presently backing up at the end of each day to a couple of external drives. This is obviously just a half-baked disaster recovery effort, not version control. I don't have ton...

What are currently the problems with Git on Windows

I wanted to download msysgit here, and it says this: "here are not enough contributors to the msysGit project to offer commercial-grade support; if you do not have the means to fix your problems (possibly with valuable advice from the msysGit mailing list), or to entice people who can fix them, it is unlikely that your problem gets solve...

Adding eclipse jvm arguments to version control

Hi, In our eclipse project we have some jvm arguments that are required for the project to work. The project is connected to clearcase for version control. How can we add the jvm arguments to version control so new developers will have them set up when they join the project (or have the rest of the team updated when someone makes a cha...

Should the web.xml file be under version control?

In the past, I've only developed Java applications. This is my first time attempting an actual web app on my own, so pardon the painfully rookie question. Should I add the WEB-INF/web.xml file to version control? It appears to be a generated file, so my instinct is to add it to the ignore list, but I thought I'd ask and make sure. Th...

How do I create a branch from a specific changeset if the folder hierarchy has changed?

Hello, I was recently tasked with creating a branching plan for our project, and part of that involved creating a few feature branches and release branches. I also had to clean up the source control tree so that the branches could be self contained. I basically started with this: / ./src ./model ./processtemplates ./data ./o...

What's the best way to deploy multiple projects to a server with Git?

I am about to take the plunge and start using Git for actual projects that others use! So far I've used Git on some basic projects and played around with Github for some university projects, but now me and some others will be working on multiple projects. As a result we'll be hosting Git on a remote server and to be honest it'd be great...

Visual Studio source control: where to put the working directory?

I've been tasked with setting up source control for some Visual Studio 2010 solutions. By default, VS puts its projects into "My Documents\Visual Studio 2010\Projects" which maps to something like "C:\Documents and Settings[user name]\My Documents\Visual Studio 2010\Projects". When checking out a solution from source control, do most p...

Getting vc-diff to use ediff in Emacs 23.2

Had this working well in Emacs 23.1.x but it appears to have broke in the move to Emacs 23.2 I want to use ediff when comparing working copy of a file with SVN HEAD. Normally I press C-x v = and ediff runs because of the following configuration in my .emacs ;; Use ediff and not diff (setq diff-command "ediff") But, alas I still g...

Why maintain traditional detailed ChangeLog in modern world (with SVN, Mercurial, Git)?

Detailed ChangeLog entry usually tell who, when and what function changed and for why this change done. And this for every separate function in the source code tree! As I understand ChangeLog come from past when there were no good VCS. So traditional ChangeLog doesn't need at all as you can get it all from: $ svn log . $ hg log ...

How to manage source control changesets with multiple overlapping changes and daily rebuilds?

I am working at a company which uses cvs for version control. We develop and maintain an online system involving around a hundred executables - which share large amounts of code, and a large number of supporting files. We have a head branch, and live branches taken from the head branch. The live branches represent major releases which ...

Suggestions for Distributed Version Control in Eclipse

We're a small software company that has been using CVS and SVN for version control (and Eclipse for writing code) for about 10 years. We're now considering switching some of our projects to use a distributed version control system. We're looking to use something like git, mercurial, etc. But--and here's the key--our new system has to...

PowerBuilder and Visual Studio files in same StarTeam project?

We have a system that is largely written in PowerBuilder 11.5 and we are using a single StarTeam project to hold the source code. Now we are wanting to add some related websites developed in ASP.NET with Visual Studio 2010 to source control as well. We would like them to be able to share the same set of Change Requests as the PowerBuil...

TFS2010 Branching into a subfolder of another branch

We have a folder structure in our source control where some things are branched, and some aren't. The branched stuff follows a (standard?) pattern of Production, Main, Development branches plus the occasional branch for a large project. Sometimes as part of those large projects web branch some of the stuff that is normally not branch...

Import Android Test Project into Eclipse from Version Control

I have an Android Eclipse project and an associated Android Test Eclipse project checked into a subversion repository. Given a checked out working copy, how do I bring the Android Test project into an Eclipse workspace? It's easy to add the Android project to the workspace (just File->New Project->Android Project->From Existing Source ...

Standard Rails Gem for storing what User created/updated/deleted any Record?

What's the standard/best option out there for this kind of version control? The main thing I'm looking for is to track what user edited a record. I've seen these so far and am wondering what your take is: PaperTrail ActsAsAudited VestalVersions ...

I have just created small android project in Eclipse, which files I should add to version control?

I have no idea, which files should be versioned for a new android project created in eclipse. Could anyone tell me, what I should add?? ...

rails show the current version of my code on the page

On my website, in the footer, i want to clearly show which version of the code is live. I am using git as version control. It would be great to get some visual feedback to know which version is actually live. I want to show some readable number, like a gem version number. I could create a VERSION file, which i manage and increase every ...