forcing a merge into vault

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

Moderator: SourceGear

Post Reply
gobbo

forcing a merge into vault

Post by gobbo » Tue Feb 01, 2005 10:10 am

I am using the vault api and wish to force the files that are to be put into vault to always be the new version, no merging, etc. Is there any easy way to tell needsMerge changeset items to just get stuck in vault :?:

If anything I'm using Vault 3.0.0 (2752). Currently if there are any needs merge items it fails to commit because of this. Any help or suggestions would be great.

Guest

Post by Guest » Tue Mar 15, 2005 4:52 pm

I am trying to implement this feature into our automatic build process.

The file in question is automatically renamed and thus ends up with a changesetitem_modified needsmerge property = "yes".

I tried to resolve this issue by first re-getting the file after committing the rename operation and then overwriting the file with the changed file. But this has no affect on the value of the needsmerge property.

I am using v2.0.6.

Any ideas?

Thanks

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

Post by jeremy_sg » Wed Mar 16, 2005 8:11 am

You can try to use the workingfolder's ResolveMergeStatus() function.

Post Reply