version-control

What is the WORST commit message you have ever authored?

I mean, we've all done it, making some changes and the checking them in with messages such as "made some changes" or "fixed a bug." Messages so inane, so pointless, you might as well have written "magical fun bus" in their place (of this, I am guilty), as it would be, perhaps, more descriptive. I ask you then, what is the most pointless,...

how to handle constantly changing ad template code for a site in version control

for a large project ive worked on (~310k uniq/day, large site, lots of templates, lots of content), we have to deal with the client selling several sections of the site (each with different layouts) for ad revenue. sometimes, its the top of the page for a 900x250, sometimes its a 952x200 under the nav, sometimes it requires a new div wit...

maven build execute svn get

I have a project build that needs to include files from another svn location during the build. I want to execute an svn get and then copy these files to the appropriate folder for the build. Researching this issue it seems I could use ant tasks but I wanted to find out what might be the best approach to take for this build. ...

Storing 3rd party library into source control with Continuous Integration usage

I just committed a very large 3rd party library (Boost) into our source control. I set it up with its own repository. I tagged its version so that other projects could svn:externals this specific version. This is perfectly fine, until I realize that my Continuous Integration (CI) server will do a complete check out everytime I checked-i...

How to keep code and specs in sync? - are there good tools

In my team we've got a great source control system and we have great specs. The problem I'd like to solve is how to keep the specs up-to-date with the code. Over time the specs tend to age and become out of date The folks making the specs tend to dislike source control and the programmers tend to dislike sharepoint. I'd love to hear...

Why would a site display SVN version and what are the advantages?

I have not used SVN so far. Why would a Web site (such as Stack Overflow, for example) display a SVN version at the bottom? What version is it? And what are the advantages of displaying it in public? ...

How to merge source code from Vault to TFS 2008

I am looking into merging our source control provider and bug tracking software to Team Foundation Server 2008. We currently have SourceGear Vault as our source control provider and OnTime for our bug tracking software. Both currently meet our needs however as we are growing it seems that TFS is a more likely candidate for our company....

Is it possible to use Source Safe over the internet?

Is it possible to use Source Safe over the internet? Would you do it? ...

Perforce wildcard problem in branch specification

In a branch spec, I have the following view: //depot/dev/t/a/g/... //depot/dev/t/r/g/... -//depot/dev/t/a/g/p/o*/... //depot/dev/t/r/g/p/... Perforce reports an "Incompatible wildcards" for the second rule there. What I'd like to do is exclude all the directories beginning with "o". What am I doing wrong, and how do I fix this? ...

How would you use a DVCS (mercurial in my case) to develop for different versions of the .NET framework?

I'm writing some sort of new adminstration dashboard for our cms (which runs on asp.net webforms). Some of our older servers can only handle .NET 2.0 for various reasons so I'd have to rewrite my code which uses lambda expressions etc. for that. I wonder how you would use a dvcs like mercurial to develop those two versions concurrently....

Pros and cons of version promotion vs. version branches

In my current project I have to decide which technique to use when branching. I have two options (we'll assume that we already have decided to develop in the trunk): Version branches Make a branch whenever a new version is put on the test machines and tag it like "release0.1". Bugs are fixed in this branch (and then merged to the trun...

Trying to get started with git

I'm trying to get started using git, but I'm having some troubles right away. I'm using Git GUI for Windows. Keep in mind I've never used version control before and don't really know how it works. What I have is a Code::Blocks C project in a folder on my laptop's hard drive. I opened Git and created a new repository on a USB hard drive....

How can I stop accidentally checking in a file in TFS

I have a web.config that occasionally I'll checkout and modify to use a hardcoded password instead of reading it from the registry. How can I prevent myself from absent-mindedly checking it back in and annoying my co-workers? I could achieve this in the past with Perforce by creating a separate pending changelist. edit - I'd rather no...

Forcing other persons files to checkin using Sourcesafe 2005

Hello, One of my colleagues has left the company and taken his PC with him! Some of his work is checked-out. Is there a way I can check-in his work without access to his PC? This is using Sourcesafe 2005. ...

Is there any IDE or Source Control System inspired by Google Docs collaborative mode?

Google Docs (formely Writely) has implemented a collaborative mode where 2 users can edit the same document at the same time. This idea could be extended to programming through: A collaborative online IDE with Code Editor, Compiler/Linker, Source Control integrated Where each user can checkout lines of codes instead of files Where each...

Integrate Visual Source Safe with Visual Studio without using source control binding

Is there a way to integrate Visual Studio with VSS without doing source control binding? The problem I have is that my team is opposing to add source control binding to the solution and project files, since they claim it adds more problems (restrictions) for them. On the other hand, I really like to perform most of the source control o...

How can I provide feedback to my team about changes included in a build and their impact on risk?

Is this something you do already or do you know of a good tool? GOAL: Help team understand how recent source changes impact risk so they know where to focus testing efforts. Provide data over time and feed it back into planning and scoping phases of the dev cycle. PLAN: Combine svn change data with clover complexity data in a report s...

How to ignore files/directories in tfs?

Is it possible to set up files/folders to ignore on a per-project basis in tfs source control? For example, I've a website with an assets folder that I do not want to go in to source control. These assets are maintained by a separate system. Also, I don't not want to put several gigabytes of assets into source control, but I need a coup...

When would one need git-rebase?

Everytime I read the git-rebase documentation, I get lost. It feels to me like a kind of a low-level operation (read: dark magic). Quoting the docs: Assume the following history exists and the current branch is "topic": A---B---C topic / D---E---F---G master From this point, the result of either of the follo...

Does git support the versioning of arbitrary properties like Subversion?

I known that with subversion you can attach arbitrary properties to each files. In Subversion some properties have special meaning, they are the properties in the "svn:" namespace, but you can attach any arbitrary property to files. I wonder if git or any other distributed version control system support this feature. Any other version...