Merging branches on builds of a commercial product

[danny]

Hi,

I am trying to figure out the best practices for merging a new build (of a commercial product) into an older build to which I have made modifications. I read the best practices in the knowlege base and I still have questions. I would like to bring my modifications forward into the new build. I don't want to lose any of the file history I have created. Here is the only way I have been able to figure out how to get this to work.

1. Create a new (temporary?) folder on the repository to contain the new build.
2. Select the "merge branches" tool.
3. Select the old build with modifications as the origin.
4. Select the new build as the target.
5. Select the 2 revisions that represent a) the old unchanged build and b) the latest modifications I made.
6. Run the merge.
7. Solve any conflicts that could not be solved by the merge.
8. Copy the updated new build files from the temp folder to the real project folder.
9. Check in the updated files in the real project folder.
10. Get rid of the temporary folder with the updated build + modifications.

If I were not to do steps 8 and 9 and just started using the temp folder as the real project folder, I would lose the history of the project before the build occurred.

I originally tried using the new build as the origin, but since it only contained the initial upload I could not select two revisions to find "changes" that could be applied to the target folder. It seems I would have to copy the original build (without my modifications) to the temp folder, load the new build over it as a second revision, and then diffmerge the two into the real project folder that contains my modifications.

I have a feeling I am making this more complex than it needs to be. Do you have any recommendations on how should this be done?

Thank you,
Danny


-----------------------------------------------------

Database: MS-SQL
.Net Framework: version 1.1.4322.573
IIS Version: 6.0
Vault Client Version: 2.0.3.2174

[ericsink]

Vault's merge branches feature simply doesn't migrate history the way you are wanting. The history is not lost, as it is still on the original file. But it is also not propogated to the target when the merge branches operation happens. This capability is being considered for a future release, but it's a substantial change in the way the feature works.

[christian]

Hi Eric / Danny,
Are you counting Danny's post as another vote toward supporting Vendor branches (see my previous post http://support.sourcegear.com/viewtopic ... ght=#10374)?
Thanks
Christian

[ericsink]

Hi Eric / Danny,
Are you counting Danny's post as another vote toward supporting Vendor branches (see my previous post http://support.sourcegear.com/viewtopic ... ght=#10374)?
Thanks
Christian

Yes, I suppose I am.

[christian]

Thanks!