Resolve Merge Status through the command line client

This forum is now locked, since Gold Support is no longer offered.

Moderator: SourceGear


Posts: 55
Joined: Wed Mar 31, 2004 6:25 am
PostPosted: Wed Mar 19, 2008 2:49 am
Hi,
I have same problem like discussed in: http://support.sourcegear.com/viewtopic.php?t=9746

We are using Vault v4.0.6 and have checked out some bld-files using vault.exe from command-line and are also using the -exclusive flag. The server have enabled "Require exclusive locks" on this repository. Our bld-files are not listed in "Mergeable files" on server repository.

Still - When I want to check in my bld-files, they have a "Need Merge" status, and I can not check them in from command-line. Using Vault GUI client, I can "Resolve Merge Status" and then use my command-line tool to check in my bld-files. This prevents me from automating my build scenario. How can I avoid this?

Kim

Posts: 1821
Joined: Thu Dec 18, 2003 11:39 am
Location: Sourcegear
PostPosted: Wed Mar 19, 2008 8:17 am
If your concern is with your build script then a bit of advise I can offer is to keep the time between get and checkin as small as possible. If you still find yourself in a Needs Merge state, copy the file to a temp location, do a get latest with overwrite, then copy your file back.

Posts: 55
Joined: Wed Mar 31, 2004 6:25 am
PostPosted: Mon Mar 24, 2008 2:42 pm
Your tip worked, but it is annoying to copy files to temp-folder before a check-in. Can you add a future feature request for this "Resolve Merge Status" to be included in command-line tool?

Posts: 1821
Joined: Thu Dec 18, 2003 11:39 am
Location: Sourcegear
PostPosted: Wed Mar 26, 2008 10:24 am
I've added the feature request. Thanks.

Posts: 1821
Joined: Thu Dec 18, 2003 11:39 am
Location: Sourcegear
PostPosted: Fri May 30, 2008 2:42 pm
The 4.1.2 CLC now has a -resolvemerge flag for commit.
Subscribe to the Fortress/Vault blog

Return to Gold Support (Vault) -- Read-only

Who is online

Users browsing this forum: No registered users and 6 guests

cron