After 4.0.x.x -> 4.1.x.x, Get Latest shows merge errors

kjedrusiak · Post by **kjedrusiak** » Wed Feb 27, 2008 2:47 pm

My machine has the latest production code and matches the latest labeled set in the repository.

I upgraded the server and my client to v4.1.x.x.

I opened the project. Then to see what would happen I did a Get Latest at the solution level. I receive 4 or 5 dialogs telling me that merges of project files failed.

Here is the output from VS2005 which shows nothing unusual...
---- Operation started at time 03:27:08 PM ----
---- Operation completed successfully at time 03:27:14 PM ----
---- Operation started at time 03:27:14 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation completed successfully at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation completed successfully at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation completed successfully at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation completed successfully at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation completed successfully at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation completed successfully at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation completed successfully at time 03:27:15 PM ----
---- Operation started at time 03:27:15 PM ----
---- Operation started at time 03:27:16 PM ----
---- Operation completed successfully at time 03:27:16 PM ----
---- Operation started at time 03:27:16 PM ----
---- Operation started at time 03:27:16 PM ----
---- Operation completed successfully at time 03:27:16 PM ----
---- Operation started at time 03:27:16 PM ----
---- Operation started at time 03:27:17 PM ----
---- Operation completed successfully at time 03:27:17 PM ----
---- Operation started at time 03:27:17 PM ----
---- Operation started at time 03:27:19 PM ----
---- Operation completed successfully at time 03:27:19 PM ----
---- Operation started at time 03:27:19 PM ----
---- Operation started at time 03:27:24 PM ----
---- Operation completed successfully at time 03:27:24 PM ----
---- Operation started at time 03:27:24 PM ----
---- Operation started at time 03:27:30 PM ----
---- Operation completed successfully at time 03:27:30 PM ----
---- Operation started at time 03:27:30 PM ----
[02/27/2008 03:31:53 PM] Refreshing folder tree
[02/27/2008 03:31:53 PM] Folder tree refreshed
[02/27/2008 03:36:53 PM] Refreshing folder tree
[02/27/2008 03:36:53 PM] Folder tree refreshed
---- Operation started at time 03:38:07 PM ----
---- Operation completed successfully at time 03:38:07 PM ----
[02/27/2008 03:38:11 PM] Refreshing folder tree
[02/27/2008 03:38:11 PM] Folder tree refreshed
---- Operation started at time 03:38:11 PM ----
[02/27/2008 03:38:12 PM] Fetched $/Branches/Source 2.19/CRequest/CRequest.sln
[02/27/2008 03:38:30 PM] Refreshing folder tree
[02/27/2008 03:38:30 PM] Folder tree refreshed
[02/27/2008 03:38:30 PM] Fetched $/Branches/Source 2.19/CRequest/BusinessRules/PrincetonInformation.CRequest.BusinessRules.csproj
[02/27/2008 03:38:34 PM] Refreshing folder tree
[02/27/2008 03:38:34 PM] Folder tree refreshed
[02/27/2008 03:38:34 PM] Fetched $/Branches/Source 2.19/CRequest/Constants/PrincetonInformation.CRequest.Constants.csproj
[02/27/2008 03:38:34 PM] Fetched $/Branches/Source 2.19/CRequest/Constants/AppConstants.cs
[02/27/2008 03:38:35 PM] Refreshing folder tree
[02/27/2008 03:38:35 PM] Folder tree refreshed
[02/27/2008 03:38:35 PM] Fetched $/Branches/Source 2.19/CRequest/Controllers/PrincetonInformation.CRequest.Controllers.csproj
[02/27/2008 03:38:36 PM] Refreshing folder tree
[02/27/2008 03:38:36 PM] Folder tree refreshed
[02/27/2008 03:38:36 PM] Fetched $/Branches/Source 2.19/CRequest/Controls/PrincetonInformation.CRequest.UI.Controls.csproj
[02/27/2008 03:38:37 PM] Refreshing folder tree
[02/27/2008 03:38:37 PM] Folder tree refreshed
[02/27/2008 03:38:37 PM] Refreshing folder tree
[02/27/2008 03:38:37 PM] Folder tree refreshed
[02/27/2008 03:38:37 PM] Fetched $/Branches/Source 2.19/CRequest/Foundation/PrincetonInformation.CRequest.Foundation.csproj
[02/27/2008 03:38:38 PM] Refreshing folder tree
[02/27/2008 03:38:38 PM] Folder tree refreshed
[02/27/2008 03:38:38 PM] Fetched $/Branches/Source 2.19/CRequest/ReportDefinitions/OpenRequirementReportLatestActivity.rdl
[02/27/2008 03:38:38 PM] Refreshing folder tree
[02/27/2008 03:38:38 PM] Folder tree refreshed
[02/27/2008 03:38:38 PM] Fetched $/Branches/Source 2.19/CRequest/Services/PrincetonInformation.CRequest.Services.csproj
[02/27/2008 03:38:39 PM] Refreshing folder tree
[02/27/2008 03:38:39 PM] Folder tree refreshed
[02/27/2008 03:38:39 PM] Refreshing folder tree
[02/27/2008 03:38:39 PM] Folder tree refreshed
[02/27/2008 03:38:39 PM] Refreshing folder tree
[02/27/2008 03:38:39 PM] Folder tree refreshed
[02/27/2008 03:38:39 PM] Refreshing folder tree
[02/27/2008 03:38:39 PM] Folder tree refreshed
[02/27/2008 03:38:39 PM] Fetched $/Branches/Source 2.19/Microsoft.ApplicationBlocks.Data/Microsoft.ApplicationBlocks.Data.csproj
[02/27/2008 03:38:40 PM] Refreshing folder tree
[02/27/2008 03:38:40 PM] Folder tree refreshed
[02/27/2008 03:38:40 PM] Refreshing folder tree
[02/27/2008 03:38:40 PM] Folder tree refreshed
[02/27/2008 03:38:41 PM] Refreshing folder tree
[02/27/2008 03:38:41 PM] Folder tree refreshed
---- Operation completed successfully at time 03:38:41 PM ----
---- Operation started at time 03:38:41 PM ----
---- Operation completed successfully at time 03:38:41 PM ----

I'm not sure there is a problem...but want to understand what's going on.

Kyle

Beth · Post by **Beth** » Thu Feb 28, 2008 8:59 am

In Visual Studio, can you tell me what client you have set until Tools - Options - Source Control?

What version did you upgrade from?

My machine has the latest production code and matches the latest labeled set in the repository.

What is current in the repository does not have to coincide with the last label applied. Do you mean that what you have on disk matches what is current in the repository, or did you really mean you had what the last label was applied to?

Can you open your Vault GUI, connect to a repository, and go to Help - Technical Support and post the environment information, both server and client, from there?

kjedrusiak · Post by **kjedrusiak** » Thu Feb 28, 2008 10:07 am

We upgraded from 4.0.6.x to 4.1.0.x

Didn't remember but we're using the Classic client.

What I mean was my machine currently has the latest code that was checked into the repository...so a Get All (recursive) shouldn't do anything.

Client Information
Vault Client Version: 4.1.0.16216
.Net Framework Version: 2.0.50727.1433
Operating System: Microsoft Windows XP Professional
Service Pack: 2.0
OS Version: 5.1.2600
Total Physical Memory: 2.99 GB
Time Zone: (GMT-05:00) Eastern Time (US & Canada)

Server Information
Vault Server Version: 4.1.0.16216
.Net Framework Version: 2.0.50727.1433
Operating System: Microsoft(R) Windows(R) Server 2003, Standard Edition
Service Pack: 2.0
OS Version: 5.2.3790
Timezone: (GMT-05:00) Eastern Time (US & Canada)
SQL Version: Microsoft SQL Server 2005 - 9.00.3054.00 (Intel X86)
Mar 23 2007 16:28:52
Copyright (c) 1988-2005 Microsoft Corporation
Developer Edition on Windows NT 5.2 (Build 3790: Service Pack 2)

License Information
3 serial number(s):
1 of 3: 1 full users, permanent
2 of 3: 1 full users, permanent
3 of 3: 1 full users, permanent

Beth · Post by **Beth** » Thu Feb 28, 2008 1:38 pm

Project files are not mergeable by default, so no auto-merge would be attempted.

Can you look at local and remote versions in the GUI client?

kjedrusiak · Post by **kjedrusiak** » Thu Feb 28, 2008 1:40 pm

Let's just close this ticket as I'm completely rebuilding the repository anyway.