version-control

Team Foundation Server also loses code at check-in just like the SourceSafe

So we have Team Foundation Server running in replacement of our old SourceSafe for about a couple of months now and I've just had the first serious fallout. Just the same what was regularly happening all the time with the SourceSafe. I check in a file, its content arrives only partially into repository. The rest is got lost on the way. ...

Source control - How to version resources that are shared across projects

We use Team Foundation Server and have numerous ASP.NET Web Application Projects. Each of the Web Apps uses a custom content management system that we've developed in house. The CMS is itself, an ASP.NET web app. When deployed, the CMS resides in a subdirectory, such as "/Admin". The CMS is comprised of .aspx and ascx files, and the ...

Flexible vs static branching (GIT vs Clearcase/Accurev)

My question is about the way in which GIT handles branches: whenever you branch from a commit, this branch won’t ever receive changes from the parent branch unless you force it with a merge. But in other systems such us Clearcase or Accurev, you can specify how branches get filled with some sort of inheritance mechanism: I mean, with Cl...

Location of Third Party Dll's in Version Control for .NET Project

What would be the ideal location (directory) to check in Third Party Reference Dll's for a .NET Project in a version control system. Typically i have seen most people to put them under bin, so that the runtime can automatically pickup these files. However is that the right way to go. I originally wanted to have a separate directory whic...

What are effective methods to manage ownership of programs in source control systems?

Using SVN or Git the thought had occurred to me to use the directory structure as a meta data place holder. Each team would have a directory in a shared repository for their code. The more I think about it though the worse the idea seems. The reason it appears like a bad idea to me is that teams are not static entities. Teams can van...

project management / multiple versions

I am looking here for some hints and tips on how to manage multiple versions of a projet. Currently I have a development version of the application which includes some improvements and new functionnalities. In meanwhile I have to do some bug resolving. It is easy to fix the bugs on files that have not been touched by new functionnalitit...

How do I tell Git to ignore ".gitignore" ?

I just did a git init on the root of my new project. Then I created a .gitignore file. Now, when I type "git status", ".gitignore" appears in the list of untracked files. Why is that? ...

Which SCM tool supports these features?

I am using Perforce for the past 5 years or so and am very comfortable with the features it provides. Based on your experience of a SCM tool SVN, GIT, CVS, etc, can you please tell me what features from below list is supported by that SCM tool. Command line equivalent(not a cutdown version) GUI functionality Branching to maintain mul...

Vendor Branches in GIT

A GIT project has within it a second project whose content is being worked on independently. Submodules cannot be used for the smaller, as even the subproject must be included when users attempt to clone or download the 'parent'. Subtree-merging cannot be used, as the subproject is being actively developed, and subtree merging makes it...

using Maven SCM tag with Perforce

Does anyone have examples on how to configure the Maven SCM tag for perforce? ...

Can I force git diff to treat a file as a copy?

The diff functionality in git has "copy detection"--if it detects that a new file is actually a (possibly modified) copy of an existing file, the diff output shows the differences between the source file and the new file rather than just a bunch of additions from a blank file to the new file. As far as I can tell, git diff uses some heu...

Moving multiple files in TFS Source Control

I'm using Team Foundation Server 2008 (SP 1) and I need to move multiple files from one folder to another (to retain file history). In addition to Team Explorer (with SP 1) I've also got the latest TFS Power Tools (October 2008) installed (for Windows Shell integration). Now, the problem is that I can't seem to select and move multiple...

How do I minimize source control-deltas when changing Word files?

Is there something I can do or consider when working with Word files in source control/Subversion in order to minimize the size of the changes in the repository? Background For a project we have a Word document with our functional specifications with screen shots from a prototype in source control (Subversion). The Word file itself is ...

Change attributes of change-set from command line

I tried using aegis -change_attributes to change the brief_description of my current change set but it didn't work. aegis -change_attributes description="test" What should I do to make this work? EDIT: The command I was looking for was aegis -change_attributes brief_description="$DESC"; ...

private mercurial/git branch for backup?

Is it possible to create a non-visible branch in git or mercurial I can use as backup? Eg at the end of the day I have unfinished work (may even be left with syntax errors) but I want it to be backed up in the repository online, without annoying others about the mess that's left. ...

Searching ClearCase for a checkin with a specific comment

I've been asked to provide details of a checkin I did about 3 months ago into ClearCase. I know the QC number that was included in the comment but have so far failed utterly to find a way to search ClearCase for a checkin by comment. Any ideas? ...

Create git branch, and revert original to upstream state

I recently screwed up my git repo and would like to find out if there is any remedy to it. My setup is this: Central repo on github. Personal repo on github (which is a fork of Central) +Central is setup as remote (upstream/master) +Master branch (origin/master) +Feature branch (origin/feature) My workflow was like this: Ne...

What's the best way to manage revisions without using the command line?

I'm writing some simple web apps in PHP/HTML/CSS/JS, and am looking for a way to control revisions. I'm updating the source every day (and currently saving new versions in separate folders). I don't really have the command line fu, and git/subversion look daunting. What's the simplest non-command line way to manage code revisions? It can...

What's the point of tags in bazaar?

I started using bazaar after a long camping in the svn field. I had previous experience with cvs as well, and I used tags occasionally. With svn, once you release a version, you perform a svn copy of your trunk into tags, for example svn copy trunk tags/1.2.0 . In bazaar I created the same repository structure, but the absence of a bzr ...

single user easiest version control on vista home for small home projects

I am very comfortable with VSS and I would like to use a free version control at home for my small projects. I just downloaded TortoiseSVN and to me it is not very intuitive. I dont have to read long manuals. I just would like to download and be up and running. What do you recommend? I tried to download SourceGear Vault but it will not ...