I am new to Vault, so please forgive my ignorance. I have played with VSS a bit and find it cumbersome to do what I want. Hopefully there is a better and easier solution with Vault. Here's the scenario:
I am working on a project and have finalized a version for release. After release I begin working on a new version. Later a bug is discovered in the released version that needs to be fixed and a patch distributed. I need to revert back to the released version, fix the bug, and create a patch. However, I would like for that bug fix to be propogated into the new version I am working on as well. So, basically I need to merge the bug fixes I made to the released version with changes I have already made to the new version. Is there a simple and efficient way to do this? Thanks.
Fixing bugs in previous versions
Moderator: SourceGear
Here is one way to do this:
A) Show history on the folder which contains your project.
B) Find the label or date at which you released the project.
C) Branch the appropriate version into a new location in the tree. For example, if you have a tree with $/myproject/current/src, you could create $/myproject/branches/1.0/src by branching the current src into that directory.
D) Make the fix within the branch. Build / release the branch.
E) Run the Merge Branches wizard to migrate the changes from the branch's src/ back into the current src/.
A) Show history on the folder which contains your project.
B) Find the label or date at which you released the project.
C) Branch the appropriate version into a new location in the tree. For example, if you have a tree with $/myproject/current/src, you could create $/myproject/branches/1.0/src by branching the current src into that directory.
D) Make the fix within the branch. Build / release the branch.
E) Run the Merge Branches wizard to migrate the changes from the branch's src/ back into the current src/.
Jeff Clausius
SourceGear
SourceGear