We are trying to work on branching with our solution. We have a lot of projects, so this is becoming a nightmare with bindings to source control. So here's my list of questions some people may know the answer to:
1. How do we have the source control bindings updated after we branch to a new location?
2. If we have a file called something.cs that's been modified on the trunk and the branch and we merge, how do we know if what we're about to overwrite has been modified since we branched?
3. If we merge back in, how do we keep from overwriting source control binding information?
Branching ponderings
Moderator: SourceGear
1) That's going to depend on how you are branching. Are you branching the entire solution, or a subproject, or some smaller portion?
If it's a web project, we have a KB article on that here: Branching Web Projects
Also, there was a Microsoft Bug related to this as well: Branching a project stills checks out file from trunk in IDE. So you may want to check that out and see if it applies to your situation.
2) During the merge branches, the changes will be listed. Also, you can run history on your trunk and filter it from the date of the branch forward to see what's been going on since then. You might want to run a test to see if you get the results you are looking for.
3) You can be selective about what you merge back in. You can also perform a diff if you want more information before merging.
If it's a web project, we have a KB article on that here: Branching Web Projects
Also, there was a Microsoft Bug related to this as well: Branching a project stills checks out file from trunk in IDE. So you may want to check that out and see if it applies to your situation.
2) During the merge branches, the changes will be listed. Also, you can run history on your trunk and filter it from the date of the branch forward to see what's been going on since then. You might want to run a test to see if you get the results you are looking for.
3) You can be selective about what you merge back in. You can also perform a diff if you want more information before merging.
-
tomcat2001
- Posts: 22
- Joined: Fri Feb 20, 2004 10:35 am
1. Well we are doing this for a windows solution, but unless I'm missing something, there's no way to branch a solution. I just have to branch from vault the folder structure. I really wish there was more of an automated way to branch and change the source control bindings. We have around 50 projects and this is quite an undertaking to update all the source control bindings.
Lance Johnson
I can take a feature request and have the developers look into whether making something automated is feasible or not.
In the meantime, one has to go through a process when branching. In the meantime, the exact instructions for branching an entire solution are as follows:
In the meantime, one has to go through a process when branching. In the meantime, the exact instructions for branching an entire solution are as follows:
- 1. Branch – This is performed in the Vault client and involves branching the folder that contains the entire solution.
2. Open the branch – This will involve an Open from Source Control. It’s not going to look right.
3. Unbind – In the VS2003 compatible client, this is done from File – Source Control – Change Source Control. Unbind everything by selecting the entries and clicking the unbind button.
4. Close – In order for the unbinding to be complete, the Change Source Control dialog box must be closed. This step cannot be skipped.
5. Rebind – Reopen the Change Source Control dialog box and starting with the .sln, rebind the project, but to the correct locations for the branch.