I'm currently revamping the way our shop does version-control. We will be using a server centric version control solution. I would like to see how other people are branching, and doing it successfully, without all of the headaches I read about. What are some field tested branching patterns you have seen in a production environment tha...
I have a TFS project that ought to be a folder under another project, so I want to move the source control history (We don't use the other features of TFS for this project, so I don't care about the project site). I've branched the code into the new location, and I'm preparing to delete the original project. This SO question deals with ...
I am using Git for a Visual Studio solution. Here is the structure of the sol. myProject.Domain, myProject.Common, myProject.Core, webClientForCustomer1, webClientForCustomer2 As the names imply, webClient projects all depend on Domain, Common and Core projects. I create a new web client app for each customer and make UI customizations...
We are trying to follow the branching strategy from the TFS Branching Guide and have reached the point where we have made a branch representing a release, which should now be made read-only. In the Properties|Security tab for the branch, it presents six user groups each with 10 permissions other than Read. Do I have to go through and cl...
I've got an annotated tag refering to a commit (does it matter if it is annotated?) and no branch refering there. Will the commit be garbage collected after some time? ...
I've seen some books and articles have some really pretty looking graphs of git branches and commits. Is there any tool that can make high-quality printable images of git history? ...
In my current repo I have the following output: $ git branch -a * master remotes/origin/master remotes/public/master I want to delete 'remotes/public/master' from the branch list: $ git branch -d remotes/public/master error: branch 'remotes/public/master' not found. Also, the output of 'git remote' is strange, since it does not...
I have a local repository I'm working on and it's remote is hosted on GitHub. I recently created a branch and started working on it making several commits and now wish to push the branch to GitHub and be able to pull it to another cloned repository. What needs to be done to accomplish this? If this is not possible using GitHub I'd be ...
Hi, The question may be not very clear as I'm not looking for a solution of a problem but rather seeking to avoid possible problems in the future. Say we have projects A B and C, B and C are based on different baselines of A. Is it ok to do merges between B and C in both directions from B to C and vice versa, wouldn't it create problem...
Let’s say you have four products each with their own release schedule. Each product has 50% shared code (common functionality across all products) and 50% product specific code. Do you need a separate source control branch for each product? Should common functionalities always be developed in one of the four product branches and merged ...
I've read about the svn move command but haven't been able to use it the right way... Here's my situation: I have a project with 5 components. Right now, I've made separate Repositories for each component and they all have a flat structure. I'd like to move all these components into a single repository so that I'd finally have a structur...
I'm using svnmerge.py to manage our repository. In trunk, file X has been replaced a directory. When trying to merge this to a branch, I get the error: svn: Can't replace 'X' with a node of a differing type; the deletion must be committed and the parent updated before adding 'X' svn: Error reading spooled REPORT request response I dele...
I'd like to create a symlink to a directory in SVN, eg. if I have branches/week-1/ branches/week-2/ ... branches/week-n/ and I'd like a directory, branches/current -> branches/week-n that I can keep pointing to the latest n (by manually updating it). Is that possible? If possible, I'd want to avoid checking out our entir...
I'm using LabVIEW (8.6) for a project with SVN for my revision control and I've come to a point where I need to branch it. I already know I'll need to make changes in the branch that I will want in the trunk. Is there any suggested method or ways to merge binary files from branches in SVN, specifically with respect to LabVIEW? Or will...
Hi, I've encountered a project where we use staircase branching. To clarify, this is the approach where code is branched for development and when the development completes, rather than cutting back to a trunk/main line, the dev branch is designated as the live code set and a new branch is taken from it. This continues ad infinitum. I p...
I am attempting to create a svn branch using git-svn. The repository was created with --stdlayout. Unfortunately it generates an error stating the "Source and dest appear not to be in the same repository". The error appears to be the result of it not including the username in the source url. $ git svn branch foo-as-bar -m "Attempt to...
I was reading this post about "branch per feature" and this one too and found myself wondering how many people out there are using this concept? I am all for continuous integration and tagging each check in. And at the end of an iteration I create a special tag set to identify the sprints result. I have never needed to take it further...
If I'm using svnmerge to track changes for a branch and I want to rename the branch (by doing an svn mv), will this cause any problems with the way the changes are tracked? Is this a safe thing to do? ...
Hi, Has anyone got any great ideas or experience around easily producing Branch Diagrams against TFS? Thanks in advance for your help Andy ...
I understand the basic concept of a branch and merge. All of the explanations I've found talk about branching your entire trunk to create a branch project and working on it and then merging it back. Is it possible to branch a subset of a project? I think an example will help me explain best what I want to do. Suppose I have an applicati...