SourceGear Support

We're using Vault 3.5.1 (4786) with the header tags option. We have development folder and a release branch off of there. We configured Vault to know SQL scripts and set the comment tag; all files have a header that includes: -- $Header$ The issue is that when I merge branches, I get conflicts on ma...

I uninstalled my test Vault and reinstalled it. I went through and recreated the repository using the same script, imported the same code, and reset my options the same as they were before as far as I can tell (except for setting it not to override EOL), and now it works, successfully preserving the...

Some of the files are UTF-8 including BOM, so I would tend to think I should use Unicode. However, some are ANSI 1252 and have non-iso-8859-1 characters. Will running Unicode with the default options handle 1252 as well, or is there something else I'd need to add to the list (iso-8859-1 and some Wi...

Are the files missing this on a GET or are you seeing this with Diff/Merge? If you are only looking at the files through Diff/Merge, then check the Diff/Merge tool's options check to see what character sets are configured. Some of the files are UTF-8 including BOM, so I would tend to think I should...

GregM wrote:Sounds like a difference in the end-of-line characters. Did these files come from a unix machine to a windows machine?

Should all be Windows Source, but it does seem related to special characters.

I'm actually not using any IDE yet; I'm trying to import a source tree from a contractor, so I'm going directly through the Vault Client GUI. Is there a setting I may have overlooked that would cause Vault to strip unicode characters (and Byte Order Marks potentially) and thus see differences in the...

I'm running Vault 3.5.1.4786 (client). I have imported a large chunk of code into the repository. However, when I do a checkout, I get files immediately showing as modified. In my options: Local Files -> Detect modified files using CRCs instead of modification times Local Files -> Unchecked the limi...