Everything needs continually merged on copied VM

[jordan]

I'm having a problem where I check in some changes, and then at some point later (maybe after closing and reopening Visual Studio) everything I touched is red and says that it needs merged.

Here's some more relevant info:
1) I am the only dev currently working on this solution.
2) I am working on a VM (VMWare). The previous developer had already created the environment, so he gave me a copy.

When I first got the VM I open the Vault client and changed the default login credentials from his to mine.
Then I opened the solution in Visual Studio and unbound / rebound the files. This seemed to work because I could check-in changes and they were under my name.

But the unresolved mystery that is really killing my productivity is these constant merge requests. I seems obvious that this has something to do with the fact that I am using someone else's VM. Maybe there is somewhere behind the scenes that is reverting back to the other dev and automatically changing my files in some way? But my merges are always the changes that I previously checked in -- so I am essentially checking them in twice: once on the real check-in, and then again on the merge.

Thoughts??

[Beth]

Try storing your working folder state/baseline files in your working folders. To do that, go to Vault Tools - Options - Local Files - Cache Location. You will see the setting in the center.

Then let me know your results.

[jordan]

Try storing your working folder state/baseline files in your working folders. To do that, go to Vault Tools - Options - Local Files - Cache Location. You will see the setting in the center.

Then let me know your results.

Beth,

It looks like the current cache location is "C:\Users\admin\AppData\Local\SourceGear".
One more relevant details is that we always create an user called "admin" on these VMs, so I am using this same folder. I do see both his name and mine within the subfolders and files. For example, under "Vault_1\Client\13bb8404....\" folder I see two subfolders: one with the last dev's name, and one for me.

Also, in the "VsipSccClient\VsipClientProjectSettings.xml" file, I see a reference to his name and hashed password.

[jordan]

Here is another piece of the puzzle:

In the options screen I changed "Store Client Cache Folder" to store in a custom temporary folder.
Then I opened Visual Studio, which prompted me to go offline or find and bind to the solution in Vault. After finding and binding I looked at the generated cache files in my temp cache folder; it created a subfolder with the previous developer's name instead of mine.

I tried unbinding/rebinding to the solution within Visual Studio, then deleted my cache and rebuilt it, but it continually creates a folder with the other dev's username.

Maybe I should uninstall/reinstall Vault?

[Beth]

Try unbinding the Visual Studio project, then close Visual Studio and reopen it before rebinding. That should force Visual Studio to have you log in again so that you log in under your account.

[jordan]

Try unbinding the Visual Studio project, then close Visual Studio and reopen it before rebinding. That should force Visual Studio to have you log in again so that you log in under your account.

This seems to have fixed the problem.
I deleted the cache manually (the reset cache button wasn't actually deleting the files). Then unbinding, reopening and rebinding, and I think the problem is resolved. To test I checked in some changes, then closed and reopened VS, and I did not get any red "needs merged" files.

Thanks Beth! You're a life saver.

[Beth]

You're welcome.