SourceGear Support

We're building a new repository (after a nice chat with Beth) to clean up our current mess. I've exported one project from repisotory A and imported it into repository B. In VS i've re-bound the project to the new repository (B). I'd prefer not to delete the project from repository A. Is there a fun...

Can I call you or can you call me? Seems like I have you confused.

(732) 906-5660

If not...

We were not using branching in tha past at all and I want to start using branches going forward.

Not sure what else I can tell you.

This is a "sample" configuration of a new repository. (The old one is all fudged up)

The kyle, patricia and rod folders will be their branch of the trunk

Earlier in the year we changed from C/E/C to E/M/C style. We are not a large shop...there are only three programmers. On our main app we can have all three programmers working in a number of the same files at the same time. We are NOT using branches. For the latest set of changes there was some pilo...

See the atteched .PNG file for a sample setup of a new repository.

We have some projects worked on by one programmer and some by multiple programmers.
(Don't want to preclude multiple programmers on the other projects.)

Does the structure in the pic make sense?

I think we found our issue...pilot error.

One of the prgrammers saw the black flag and was selecting "Resolve Merge Status" thinking it was fixing the differences automatically, instead of manually fixing the merge themselves and checking in the changes.

Thanks

Just to continue the story, here's what I had to do today... The other programmer added a number of files to a project. I added a number of file to that same project. In VS2008 the project was marked with a black flag icon. I used "Show Differences" to see what files I was missing. I then ...

Therefore if the solution or individual project has a black flag icon That tells me that they are listed in the mergeable file list. You might be able to get away with merging a project file, but definitely not a solution file. It's best to not even allow it to be listed in the mergeable file list....

OK, let me make some statements here and please validate that they are correct... The solution and project files are not mergable because different instances of Visual Studio don't guarantee the save order of lines inside the file. Therefore if the solution or individual project has a black flag ico...

Did the user by any chance perform a Get and merge the changes from Vault at any time? If so, is it possible that he deleted what you added and checked in? Latency shouldn't matter, because the Vault server still knows that changes were put in. I forgot to mention we're using Edit/Merge/Commit styl...

I work in the local office, the Vault database machine is litterally in the next room. Another programmer works at home, he is connected to out network via a VPN connection. We've been working in the same general area of the code base right now. Today he was able to check in a number of files, overw...

Not sure what that works, but it doesn.

And think I've gone through this same issue before.

"like deja vu all over again"

Thanks

I also updated to the server and client to 4.1.2...still having the same issue. 12/28/2006 08:12:32 AM <generic>: [GUIClientWorkerThread:3500] IsModified(): Could not determine files status for C:\Inetpub\wwwroot\CRequest.WebServices\Bin\Microsoft.ApplicationBlocks.Data.pdb 12/28/2006 08:12:32 AM <g...

The only thing I can think of is the latest MS patches were applied the other day.

Doing basic stuff from VS2008 seems to work.

Is this defailt behavior? I certainly didn't change anything knowingly.

And the project files are text files.

So how is this fixed.