I use SourceGear Vault in Visual Studio for source control. I don't do much more than check in/out files as a matter of course. However, there are times when more in-depth options are required and I wanted to at least record the gist of how they are done here.
1. Using the client GUI to looking at the pending changeset(s). I ran across the pending changesets by accident and realized I had lots of things that had not been committed to the system. As I went about committing them, I ran into a number of situations I wanted to list.
-Message: You Need to merge files. Right click on the file and show merge and look at the bottom right corner and if you have 0 changes 0 conflicts, the working copy and the repository versions are the same. There have been times when you show differences, that there are difference. You then do a show merge and the files are the same. I am not sure how you get differences on the Show Differences but none when doing a Show Merge, but you occassionally do. I normally do a Get Latest, which updates the flags and clears the changeset entries for the file.
-I had a situation where a file did not show as belonging to the source control system. I "Added to vault". But when I went to check-in the file, it would not check-in. I looked at the changeset and saw there was both a Delete File and Add File entry. I removed both of the entries and was able to successfully check-in the file. But there was no little icon beside the file indicating it was in the vault, but after I restarted Visual Studio, it appeared with the correct symbol indicating it was part of the vault and was checked-in.
-File Needs merge. Show differences and if check-in doesn't work or you get the message a Merge is needed, select the Show Merge option. View the changes. I usually just exit this screen and then at the end I answer Yes I want to resolve the merge by setting the file to the Editted state. After the file has been set to Editted, you can check the file in.
-If you access a file, say for a Show differences or other options, and receive the Unknown File type, the only way I have been able to get around it, is to do a Get Latest on the file and this will reset the file type and allow you to work on it. However, If you have made changes, make sure you make a copy prior to the Get Latest, because it will overwrite any changes you have made. After the get Latest, you can check the file out, copy the saved file into place, continue editting the file, and then check it into the vault.
-I have other instances and I don't remember the exact cause, but the only way to resolve it was to use the Load from the vault option.
No comments:
Post a Comment