Branch History

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

Moderator: SourceGear

Post Reply
etwilegar

Branch History

Post by etwilegar » Thu Aug 26, 2004 11:10 am

From the vault docs I got the impression that it will not import Branch/Share information. Then I saw a post that said it does?

Can someone describe how/when the import handles branches. I ran an import, but never really finsihed it. I got two projects that had been branched, but I need to get the last two. That is I got the projects v1_0, v1_2, v1_4, but I still have to get v1_5. Looking at v1_2 I did not see any branching informatiion about v1_0 to v1_2, and I could not merge between them. Did I have to wait until everything go imported before this information is imported?

jeremy_sg
Posts: 1821
Joined: Thu Dec 18, 2003 11:39 am
Location: Sourcegear
Contact:

Post by jeremy_sg » Thu Aug 26, 2004 2:48 pm

The import tool imports shared files and branched files. For branched files, you will not see a history item corresponding to the branch, but the correct history for that file will be imported. Also note that shares will only be reestablished inside the project that you're importing. If you import 1.0, and then later import 1.1, there will not be any shared items between 1.0 and 1.1 in Vault.

In Vault, you can do a Merge Branches from any folder to any other folder, by using the Tools->Merge Branches wizard.

etwilegar

clarification

Post by etwilegar » Thu Aug 26, 2004 3:16 pm

So just to clarify. Vault will not import the "link"/"path" that you would see in VSS. If you went to a specific file, it would not see the relationship between v1.0 and v1.2.

jeremy_sg
Posts: 1821
Joined: Thu Dec 18, 2003 11:39 am
Location: Sourcegear
Contact:

Post by jeremy_sg » Fri Aug 27, 2004 12:24 pm

I'm not sure if I understand your quesiton, so forgive me if I don't answer what you're asking.

Vault retores any active share links inside the project that you are importing. If you've had a file shared in the past but one of the locations has been branched, then the share is no longer active, and the branched file will be imported (with full history) as a new file. Vault history will not contain a history event for the VSS branch from a share.

So if the example in VSS is:

$/project/1.0/myfile.cpp
And you share it to
$/project/1.1/myfile.cpp
and then branch
$/project/1.1/myfile.cpp

The imported data in Vault will not have any wpecial history item saying that $/project/1.1/myfile.cpp was branched from $/project/1.0/myfile.cpp

Post Reply