I have a git repository with (at present) three branches: head is the stable version (not to be confused with git HEAD) experimental is experimental code; it's supposed to compile norman is my sandbox; code in it might be broken The "master" git repo is on a file server that is backed up. But I have replicas on a local disk, on a m...
My company is floating the idea of extending our version numbers another notch (e.g. from major.minor.servicepack to major.minor.servicepack.customerfix) to allow for customer specific fixes. This strikes me as a bad idea on the surface as my experience is the more branching a product does (and I believe the customer fixes are branches ...
In TFS, what is the best way to mark dead branches? Do you move your branch? Branch release it? Delete it? Rename it? What problems have you run into for each of these approaches? What are the good points? It would be nice if there were a simple interface solution that would simply mark or filter the current view if a particular b...
Hi I want to create a simple stored proecudre which does the following: Psudocode @tempSelect = "SELECT * FROM Table" if (@Param is NULL) then exec @tempSelect else exec @tempSelect + ' WHERE id = ' + @Param + ' Is this method efficent? Thank you. ...
I'm creating a workflow for a form. Form is an approval form that requires 4 approvers or rejected. I can get the approvals to work but not the rejections. I'm using Designer 2007. My work flow looks like this: Step 1: Condition: If Created equals created Action:Email to notify all approvers. Step 2: Condition: Else If TomR equal...
I have multiple website projects in a single repository each of which have a copy of WordPress. Updating WordPress means updating all project folders and keeping redundant copies. This is useful for my rsync scripts which sync the entire folder. It also gives me fully working local copies of the site. There are a number of ways I can se...
I am currently evaluating different source control solutions for work, and have a few questions about branching. I have the basic understanding of how to branch, but i am unsure of how our build machine (CruiseControl.net) can get a branch to build it. We have many projects, which are all relied appon by other projects (there are othe...
We are upgrading our source control (most likely to Vault) at work and are moving to the branch methodology, and are having some problems with working out the folder structure to use. We intend to use the Trunk as the development line, and a branch will be a release and bug fixes to that release. We have come up with two folder structu...
We have a setup with a development "trunk" in our recently-migrated-to-from-VSS TFS system and developers have been doing work in branches off the trunk, which are merged back in. We've been diligently commenting our changesets at check in time, something we never did in the VSS days. However when I right-click on a trunk file in the S...
I created a customised version of Wordpress for us to use as a template for our web projects, stored in an svn repository. It has various properties set (ignores, wordpress + plugins as externals) to ease workflow and updates. My question is, how to use this as a base for others projects / repositories? If you export, it loses all th...
What is a trunk, branch and tag in subversion and what are the best practices to use them. What tools I can use for subversion in Visual Studio 2008? ...
We have 2 repositories, one for current code, one for project management. Now we need to branch code to the project management repository. SVN gives me an error, and I found in the doc that SVN cannot do this work (different repository), So I export the code and check in to the project repository. The questions: how to branch code ...
We've already learned how to switch which branch points to what using git branch -m. If I do this, is it going to make life difficult for the other people pulling from my repository? Say I do a bunch of stuff on a branch topic1 and then do a git branch -m master old_master git branch -m topic1 master git push origin master and then s...
I'm a single developer using Mercurial to create a program. I have so far committed at every step of developing, and I have messed things up and want to work on something else. How shall I go to a previous state (ie. rollback) and then create a branch, maintaining the newer states? Does rollback ever delete anything? Should that be a...
Imagine you have a large software project where you have to support several branches (releases) at the same time. For instance you have a production release on the website, a integration test release that is currently tested by the customer, a testing release that for your local systems test and a development release where your developer...
Is there any utility that works with either Subversion or (preferably) Team Foundation Server's source control system that shows a visual representation of the source tree? e.g. it shows branches (with labels) splitting off, merging back in and so on. ...
Say you have the following code block: if (Light.On) { // do something... } else if (Light.Off) { // do something else... } else { // this state should never be reached } Now assume that the applications logic dictates that in this part of the code, the last state should never be reached, but it is not something that can b...
I've got a source code tree in subversion with several branches. I've just finished a fairly intense debugging session in an otherwise active branch and now need to merge the changes across to the new branch. The new branch was taken off trunk (which represents released code) recently, after all the development in the old branch (obvious...
I've moved a folder in tfs using the "move" command but now I cannot create branches off the moved folder based on date or label (label was created when source was in the old folder). I can however create a branch based on "latest version". I get an error message "no items match in if I try to branch of a label. I'm guessing the lab...
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 ...