Question on Branching

[Manisha]

Hi,
I am using Vault Standard version 5.1.1


My scenario is that I have a Test/Production version (8.0.0.1) - This is a labelled version in vault.
Development version, which is not stable is (9.0.0.0)

Now there was a bug reported in 8.0.0.1 version which requires immediate fix.
I was reading the article on branching by Eric Sink - http://www.ericsink.com/scm/scm_branches.html

As per the article this looks like the perfact scenario for branching.
I am not sure how to go forward with it.

Because I already have labelled version 9.0.0.0 - so if I branch then it will branch from 9.0.0.0
But what I want to do is branch from 8.0.0.1 and apply the fix, label it as 8.0.0.2 and then merge 8.0.0.2 with 9.0.0.0.
Can it be done? If so, I would appreciate if you could tell me the steps.

Thanks,
Manisha

[lbauer]

You can branch from a label.

Right click on the Test/Production folder and select Show Labels.

In the list of labels, find 8.0.0.1.

Right click on the line for the 8.0.0.1 label, and select Branch $/Test/Production.

Branchfromlabel.jpg (38.92 KiB) Viewed 3478 times

For instance you can create the Test/ProductionBranch

After you apply the fix and checkin your edits, label it 8.0.0.2, then merge Test/ProductionBranch
into Test/Production.

[Manisha]

Linda,

Thank you very much for your reply.
I would follow the steps suggested by you.

Thanks,
Manisha

[lbauer]

Let me know if you have additional questions as you do the merge.