We have a folder structure in our source control where some things are branched, and some aren't.
The branched stuff follows a (standard?) pattern of Production
, Main
, Development
branches plus the occasional branch for a large project.
Sometimes as part of those large projects web branch some of the stuff that is normally not branched. For instance we might branch $/source/Libraries/LibraryA
into $/source/branches/Project1/LibraryA
to make some major Project1
-related changes to it.
Then when Project1
is nearing release, we reverse integrate both from Project1
into the Main
branch, and from Project1/LibraryA
into the Libraries
folder.
Well, that's how we did it in TFS2008. Recently we moved to TFS2010 which seems to keep track of what things are branches and what aren't. So when we try to branch LibraryA
as a subfolder of Project1
, we get and error message that Project1
is already a branch.
Is there a way around this? Are we using TFS2010 wrong, and if so, what would be the right way?
As I detailed in "Team Foundation Server and branching characteristics, compared to others", the branching model of TFS has evolved quite a bit between TFS2008 and TFS2010.
The TFS Branching Guide and Branching Guidance can help.
See this thread for more details on branch management:
W In TFS 2010, a user must have Merge permission set to Allow for a given path can do the following:
See also this thread with a scenario closer to your situation.
I had similar issue. I was trying to create another branch in DEV (in separate folder) from MAIN and this error popped up.
What resolved this problem for me was to create a new branch in the root and later move it to Dev.