What is the MKS equivalent of SVN Update?

Question

I am contracting at a company that uses MKS. I have used SVN in the past as well as Mercurial and Git but must use MKS currently(so far I can't seem to find any documentation on it or best practices).

I want to know what the equivalent of SVN Update in MKS is? I have tried resynchronize but all too often when I do that MKS wants to overwrite files that I have been working on.

Answer 1

When you're working on source, you have to 'Check Out/F2' the file first. I assume you didn't do that? If not, you'll have to move your work somewhere else, check out the file and then copy your work back over the checked out version. Then you can check it back in.

Note that you'll have to create a change package first, this is what all of your 'Check Outs' will be done against. After all the changes are done, you'll need to submit the Change Package.

Answer 2

When you "resynchronize" in MKS, the default behavior is to overwrite any working files in your sandbox with their member revisions from the current branch (or trunk if no branch exists.)

You can modify the behavior via configuration. In the client:

1. File->Edit Preferences
2. Expand the "MKS Source" tree node (2007) / "Configuration Management" tree node (2009)
3. Expand the "Commands" tree node
4. Select the "Resynchronize" command

You will want to modify the following settings

• Overwrite if Pending: Uncheck
• Overwrite Working File if Changed: Uncheck
• Overwrite if Deferred Operation Exists: Uncheck
• Merge Working File if Changed: Check
• Merge Type: Automatic
• On Conflicts: Launch Tool

The "resync" command will now attempt to automatically merge the member revision into your working file. If it cannot auto merge because of a conflict, it will launch the merge app to allow you to resolve the conflict.

I used SVN and CVS prior to using MKS, and I've found this modified resync behavior to be more intuitive than the standard resync behavior.

Answer 3

The MKS command of SVN update is "lock member" then "check in" using the MKS Integrity client 2007 or 2009. Cheers, Ramil