version-control

Two approaches to Version Control (TFS): Need advice.

Hi. We are reaching a point in our project where we need to make a production deployment but also need to have ongoing development for future features. Our source control currently has a single development branch. In my previous company a 3 branch system was set up with Development, Integration, Production. Feature development was done ...

Is `hg pull --rebase` analogous to `svn update`?

This question assumes there's a "blessed" central repository that members of a team clone from push to when they have contributions that they want other team members to see pull from when they want to see other people's contributions. etc. If so, I would assume hg update is not analogous to svn update (why would there be two commands...

How to cope with versioning of software documentation and the software itself?

I need some experiences concerning the writing of software documentations and user guides. When I write formal documents like software specifications, every document gets a version number and in the document there is a change history after the table of contents, where you can keep track of the changes made to the document. If I'm now w...

Subversion svn:externals - What's wrong here?

I first want to say I've read the Subversion manual. I've read this question. I've also read this question. Here's my dilemma. Let's say I have 3 repositories laid out like this: DataAccessObject/ branches/ tags/ trunk/ DataAccessObject/ DataAccessObjectTests/ PlanObject/ branches/ tags/ trunk/ PlanObject/ PlanObjectTests/ Win...

How do I add programmatically-generated new files to source control?

This is something I've never really understood about source control, specifically Subversion (the only source control I've ever used, which isn't saying much). I'm considering moving to git or Mercurial, so if that affects the answer to my question, please indicate as such. Ok. As I understand it, every time I create a new file, I hav...

svn history via command line

I am trying to write a utility in python to get me all the files that have been modified for a specific branch....i don't care about the date or who commited. how would I go about doing this? I can handle the python part, I just can't find a command in svn to give me the output. ...

Check what will be committed before actually committing

I'm in the process of learning mercurial, and even though I installed TortoiseHG, I find myself turning more and more to the command line. So often I would like to check what the result of a given hg command would be, before I actually run it, is there any equivalent to the -whatif switch known from powershell i can use, or how would yo...

Starteam to X migration? (where X is one of: svn/git/hg/bzr ...)

Is there a tool that can migrate Starteam to svn or git or any other modern/decent source control system? I'm thinking of something along the lines of how git-svn works; allowing you to use git to pull from an svn repository. Something that can import a StarTeam repository and convert it to an svn repository, but also keep pulling from...

Are there any tools to find out which changeset caused a specific bug?

After a bug has been located and fixed, we would like to trace the bug back to the change that originally caused it. That way, our team can look at it and learn how to avoid that type of bug in future changes. Obviously, if automated tests catch the bug, then it was probably a recent change. But that doesn't work in the case where the b...

Looking for Recommendations on Version Control System with Intuitive (.NET) API?

I'm working on a project which generates (composite) Microsoft Word documents which are comprised of one or more child documents. There are tens of thousands of permutations of the composite documents. Far too many for users to easily manage. Users will need to view/edit the child documents through the app which hides all of the nasty...

How can a corrupted RCS file be safely removed from a CVS repository?

I'm seeing the following error when doing an update: cvs update: nothing known about src/java/com/foo/bar/SamplePageBean.java Also, when trying the view the directory containing that file using ViewVC we get soething like this: An Exception Has Occurred Python Traceback Traceback (most recent call last): File "/opt/bin/viewvc-1.0.5...

Rank Source Control Options-VSS vs CVS vs none vs your own hell

It seems like a lot of people here and on many programmer wikis/blogs/ect. elsewhere really dislike VSS. A lot of people also have a serious dislike for cvs. In many places I have heard a lot of differing opinions on whether or not using VSS or cvs is better or worse then using no source control, please rate the worst and explain why!!!!...

TFS 2008: Questions about auto Builds, Labels and general versioning

Hi all, a bit of background first... I am setting up a versioning numbering system for our project which currently only has a development branch, but we are now moving towards our first deployment. We are using TFS and we use nightly builds on our dev branch. The way we are probably going to go with this is that when we get ready for ...

Team Foundation Server- How to effectively set up source code layout with dependencies.

I am currently trying to set up a new visual studio 2008 solution while using TFS. Current structure is as follows ProjectName - src * SomeSolution.sln * ProjectFolder1 * ProjectFolder2 - Third Party Tools In subversion I would just go to the root directory and do svn update. Or with Git, git pull origin from the root d...

Unable to add Solution to TFS 2010 due to existing (invisible)binding

I have a smallish utility library I made that I had created in TFS Beta 2 to test out TFS. I now have TFS rc1 installed(and Beta 2 uninstalled) and am trying to add my Solution to TFS. I get an error saying that it is already bound to my old TFS, which was on a different system then this one. Strangely, when I go into Source Control ...

Visual Studio: How to exclude whole directory from source control?

I've got a Visual Studio 2008 project that contains files that are code-generated in a pre-build step. None of these files should be included in source control. I cannot predict how many files there are going to be, or their exact name. The generated files are included into the Visual Studio project file via a wildcard directive: <It...

Which version control suits best this list of requirements

Hello, Our dev team is small (3 developers) and windows based. I'm looking for a source control that can do the following: Check out files for editing and warn others that file is used Check in files and merge if they have changed Split baselines for release versions and merge baselines if needed Visual Studio integration Can work ov...

2-Version software: Best VCS approach?

I suppose I'd better explain my situation: I'm in the process of developing some software, and I'm at the stage where I'd like to split my project into two branches which differ in features. It so happens that this application is an Android application which I will be deploying on the Market, which has the constraint that every app must...

Git: Where are the original files?

I am a Git newbee with UNIX SCCS and Microsoft Visual SourceSafe experience. I’ve created a repository, looked at what Git created, and can’t find the files anywhere under the .git tree. So, how do I know my files are safely stored in Git? ...

Does Git track Versions?

I am a Git newbee with UNIX SCCS and Microsoft Visual SourceSafe experience. In SCCS, each file has a version (I%), which is made of Release (%R), Level (L%), Branch (%B), and Sequence (S%). %I is equal to R%.%L.B%.%S, okay? These are referred to as ID Keywords. The purpose is you insert these ID Keywords in the source code before chec...