Merging two branches after VSS Import

If you are having a problem using Vault, post a message here.

Moderator: SourceGear

Post Reply
Drew630
Posts: 2
Joined: Mon May 08, 2006 1:24 pm

Merging two branches after VSS Import

Post by Drew630 » Mon May 08, 2006 2:00 pm

Hello,
I am new to using the Vault program, so bear with this somewhat simple question. We recently switched to Vault from VSS. Our project was branched in VSS during our recent development cycle. Upon finishing our developement, the project was imported into Vault and now we wish to merge those branches into one target folder. While going through the Merge Branches wizard, I came to the Select changes to be Merged screen and got lost. According to other posts that I have been reading here, the import does not keep the same versioning according to the dates of file changes in VSS. The lack of ability to sort by date on this screen is irritating, as now I have been looking through the numerous files in vain to locate the latest of each of the code files. I realize that the labeling issue prevents me from merging two sets of labeled code, but all I need to do is merge the current version of code in the origin folder with the current version in the target folder. How do I select the current verion of my files using this screen? One method that I tried was checking out all the code files and then checking them back in to try and get a list of the current files at the top but this method was unsuccessful. Another method was to label the current code files with a label in Vault, but that provided no insight either.

Any help would be appreciated. Attached is the look of my screen.

Drew630
Posts: 2
Joined: Mon May 08, 2006 1:24 pm

Attachemnt missing

Post by Drew630 » Mon May 08, 2006 2:03 pm

Apparently the attachment didn't get added.
Attachments
vault.JPG
vault.JPG (101.29 KiB) Viewed 1639 times

Post Reply