Concurrent (non-exclusive) merge problems

[joedpsg]

Just wondered if there are issues with concurrent mode (non-exclusive locks) when working from Visual Studio. Had some cases in this mode where another programmer checked in a file I had checked in earlier and undid lots of my work. She insists that no merge messages or warnings were issued-- she just checked in as usual.

We both unchecked "always request exclusive locks" in the VS options for Fortress at the beginning of this project.

I have gone back to re-enable exclusive locks until I can determine why I lost my work.

Maybe we are not doing this right. Any pointers would be appreciated.

[Beth]

Are you using the Classic or Enhanced client? Which version of Visual Studio are you using?

[neil.gallagher]

Hi Beth,

I am another user who has had the same problem. Files are getting overwritten with no merge option. There is also no merge status icon appearing VS 2005 (using enhanced client). Not completely sure on this but it seems to affect .sql files more than others . Users have the Source Safe style check in/check out with allow multiple checkouts allowed.

One other question what happens if one user has allow multiple check outs and one user has exclsuive set. Who wins?

Vault version is 3.1.3

[neil.gallagher]

Sorry. Vault version 4.1.3

[Beth]

I'm trying to prepare a test here on one of my machine so that I can see if I can reproduce this. It may take until this afternoon.

[neil.gallagher]

Any update on this.

Thanks

[Beth]

No solutions yet. I think taking a closer look might help. Could you send an email to support at sourcegear.com (attn: Beth) with a link to this forum thread?