How to check out with leaving the work copy intact?

vrapp · Post by **vrapp** » Fri May 26, 2006 1:19 pm

Hello,

let's say, I try to check in a file, and Vault says ithe file is changed in working folder. I open DiffMerge and see that, indeed, the working file has something repository one does not.

What do I do at this point?

in the Diff window, "merge to center panel" is disabled.

In the Vault dialog, there's "attempt automatic merge", but I'm somewhat afraid of the word "attempt" - what if it goes wrong, will I lose the changes? how will I know?

same with "merge later". Looking at the diff, I'm sure I don't want to merge, neither now, nor later.

What I do want is to mark the working copy as checked out without phisically checking it out. I think if the dialog showed an option like that, it would be much more straightforward.

Also, I think that Diff window might include some functionality that would allow me to merge manually, in case both repository version and work version have unique parts. Maybe the prompt "locally modified file" might also include option "merge manually", opening DiffMerge in 3-way mode, where the "merge to center panel" would be enabled.

lbauer · Post by **lbauer** » Fri May 26, 2006 3:21 pm

If you "Show Merge" and like the automatic merge result, you can accept it; or you can move changes from the working version or repository version into the merge result; or you can manually modify your file to accomodate any changes/conflicts in the repository version.

To move changes into your working file, you can remove the read-only flag for the merge tool:
http://support.sourcegear.com/viewtopic.php?t=2670

What I do want is to mark the working copy as checked out without phisically checking it out.

The best option to use here is "merge later." It will checkout your file without overwriting any local modifications, and you can decide later how/if you want to merge it with the changes in the repository.

vrapp · Post by **vrapp** » Tue May 30, 2006 12:57 pm

If you "Show Merge" and like the automatic merge result, you can accept it

Hmm... Are we talking about the same thing?

The dialog is called "Locally Modified File". It has 3 overwrite options - "overwrite", "do not..." and "attempt automatic merge", and the button "Diff..." . There's no "show merge".

If I click "Diff...", I see two panels - "working folder version" and "repository version". Where can I see the merge result that I would like or not? that's actually exactly what I was looking for.

Vadim

vrapp · Post by **vrapp** » Tue May 30, 2006 1:02 pm

oh, and another thing - just noticed.

On that dialog "locally modified file", if I press "cancel", the file still gets checked out. I thought "cancel" would have to stop the operation.

lbauer · Post by **lbauer** » Wed May 31, 2006 9:17 am

Are you using the Vault GUI Client for the operations you have described, or Visual Studio?

What version of Vault are you using? And if you're using Visual Studio, what version?

This will help me provide the proper answers.

vrapp · Post by **vrapp** » Wed May 31, 2006 11:32 am

Are you using the Vault GUI Client for the operations you have described, or Visual Studio?

I tried Vauld Client 3.1.8, VS6, and VS.NET 2003.

In Vault Client (dialog "check out"), I can't even see the difference - there's no button to open Diif.

IN VS6 and 2003, it's the same dialog:

Once I click Diff... , I see this dialog: no center panel, and no merge result.

lbauer · Post by **lbauer** » Wed May 31, 2006 1:57 pm

Let's start with the GUI Client because it's easier to see how Vault Merge works.

If you have edited a file without checking it out first, the status may be Renegade or Needs Merged. Needs Merged means the file in the repository has changed since your last "get" of the file and has changes you don't have in your local version.

You can check out the file using the Do Not Overwrite/Merge Later option. This will checkout your file but not make any changes to it. It should still have a Needs Merge status.

Right click on the file and select Show Merge from the context menu. This will bring up the Merge dialog with a center pane for Merge Result. You can accept or change the Merge result. Then you'll get the message "Would you like to resolve the merge status now?" If you select "Yes." The file will now be Edited and you can check it in.

vrapp · Post by **vrapp** » Wed May 31, 2006 2:32 pm

I see. I have to say, it's still somewhat confusing.

1. For a renegade, after I say "don't overwrite/merge later", the status reads "merged", which is probably incorrect.

2. when I close Diff, it prompts to save central panel; if I say "yes", it then says that it can't save it.

3. regardless of my answer to the question "resolve merged status?", the status reads "merged" - probably because of (1).

4. I think it would be more straightforward to do all this during the checking out, from the button "diff".

I understand, it's somehow possible from VS as well?