Master Pages

[bridg2bb]

When working with master pages that have no code behind, they are just simply .master pages. Vault detects these files as binary files and refuses to merge them. The files are most definitely text files and you can even run diffs on them using vault's built in client. It detects every difference between the two files. If you try to do a merge of any type including a manual merge, you just get an error stating they are binary files. So my question is, is there a way to allow them Vault to do merges on these files since it can do diffs on them? Just for note this is making things quite difficult for our development shop and making Vault less useful for us. We currently have 20 - 30 masterpage that go into our SharePoint environment with multiple people working on them, so this is effectively killing our source control.

There are other issues involving SharePoint projects with vault. For example, if I rename a feature file (definition of what needs to be sent to the SharePoint server) Vault does not pickup on the rename and will attempt to check in the old file that no longer exists. It then has no knowledge of the renamed version, so we have to discard the file add for the old name and then add the renamed copy.

Information
IDE: Visual Studio 2010 SP1
Vault Version: Vault Standard 5.1.1 (We have our keys for 6 and are upgrading within the next month just have a lot of people we have to notify before we do so)
Vault Plugin: Enhanced Client
Vault Mode: CVS
Project Type: SharePoint 2010 Package

[Beth]

The .master extension should be added to the Mergeable File Types list in the Vault admin web page. For each repository, there is a link called File Types. You will need to add the .master extension to each repository's File Types list where you use those files.

On the SharePoint project...

What is the file type of the feature file?

Is that file listed in the project file?

Does that file have an icon next to it, such as a green circle with a white check?

[bridg2bb]

Thanks so much for the response. That answers that, which should make our lives much easier!

Feature files are strange they are XML files, but they the IDE treats them "special" because there is an UI for configuring the feature. When we start a project a feature entitled "Feature1" is added automatically. Vault detects this and tries to add the corresponding XML file. So the feature (even though it is just part of the IDE and doesn't really exist) and the underlying XML file have the addition icon. If we rename the feature through the IDE, vault loses track of it and there is no longer any icon. If we then check the vault pending changes the original "Feature1" is still listed as an addition. If we tried to check in at this point, the check in fails because Feature1.xml no longer exists. So we have to back out the addition and then readd the feature file with the new name. If we add a new feature rather than renaming everything is fine.

[Beth]

Is it possible to check in the Add of the feature first and then rename the feature after the add is committed?