We moved our TFS 2010 installation to another Server and upgraded to TFS 2017. So far everything worked fine but merging branches.
In Source Control Explorer we start the process with "Branching and Merching" --> "Merge.." --> choose "Selected changesets" and on clicking next, the Changesets should be listed. Here we geht the timeout message.
If I search for Changesets with the "Find Changesets" Dialog, the search performs pretty well and lists the results as expected.
Thanks for your help in advance.
Edit: As somewhere else suggested, i tried to merge Changesets with the command line and "tf merge" command - worked fine.
Here are the Event Log details:
TF53010: The following error has occurred in a Team Foundation component or extension:
Date (UTC): 19.12.2016 12:18:25
Machine: MIA-TFS01
Application Domain: /LM/W3SVC/2/ROOT/tfs-1-131264048035011226
Assembly: Microsoft.TeamFoundation.Framework.Server, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a; v4.0.30319
Service Host: 7f064ff2-7678-4a55-a681-2e24a479d8f8 (DefaultCollection)
Process Details:
Process Name: w3wp
Process Id: 4168
Thread Id: 12828
Account name: xxx
Detailed Message: TF30065: An unhandled exception occurred.
Web Request Details
Url: http://xxxxx:8080/tfs/DefaultCollection/VersionControl/v5.0/repository.asmx [method: POST]
User Agent: Team Foundation (devenv.exe, 12.0.40629.0, Pro, SKU:15)
Headers: not available
Path: /tfs/DefaultCollection/VersionControl/v5.0/repository.asmx
Local Request: False
Host Address: 10.10.20.143
User: xxx [authentication type: Negotiate]
Exception Message: TF246018: The database operation exceeded the timeout limit and has been cancelled. Verify that the parameters of the operation are correct. (type DatabaseOperationTimeoutException)
Exception Stack Trace: at Microsoft.TeamFoundation.Framework.Server.TeamFoundationSqlResourceComponent.TranslateException(Int32 errorNumber, SqlException sqlException, SqlError sqlError)
at Microsoft.TeamFoundation.Framework.Server.TeamFoundationSqlResourceComponent.TranslateException(SqlException sqlException)
at Microsoft.TeamFoundation.Framework.Server.TeamFoundationSqlResourceComponent.MapException(SqlException ex, QueryExecutionState queryState)
at Microsoft.TeamFoundation.Framework.Server.TeamFoundationSqlResourceComponent.HandleException(Exception exception)
at Microsoft.TeamFoundation.Framework.Server.TeamFoundationSqlResourceComponent.ExecuteCommand(ExecuteType executeType, CommandBehavior behavior, String performanceGroupName)
at Microsoft.VisualStudio.Services.CircuitBreaker.Command.<>c__DisplayClass7_0.<Execute>b__0()
at Microsoft.VisualStudio.Services.CircuitBreaker.CommandAsync.<Execute>d__28.MoveNext()
--- End of stack trace from previous location where exception was thrown ---
at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
at Microsoft.VisualStudio.Services.CircuitBreaker.Command.Execute(Action run, Action fallback)
at Microsoft.TeamFoundation.Framework.Server.TeamFoundationSqlResourceComponent.ExecuteCommandWithBaseCircuitBreaker(ExecuteType executeType, CommandBehavior behavior, String performanceGroupName)
at Microsoft.TeamFoundation.Framework.Server.TeamFoundationSqlResourceComponent.ExecuteReader()
at Microsoft.TeamFoundation.VersionControl.Server.VersionedItemComponent.QueryMergeCandidates(Workspace workspace, ItemPathPair sourceItemPathPair, ItemPathPair targetItemPathPair, RecursionType recursive, Int32 sourceDeletionId, MergeOptionsEx
options, PathLength maxServerPathLength)
at Microsoft.TeamFoundation.VersionControl.Server.MergeCandidate.QueryMergeCandidates(VersionControlRequestContext versionControlRequestContext, Workspace localWorkspace, ItemSpec source, ItemSpec target, MergeOptionsEx options)
at Microsoft.TeamFoundation.VersionControl.Server.TeamFoundationVersionControlService.QueryMergeCandidates(IVssRequestContext requestContext, String workspaceName, String workspaceOwner, ItemSpec source, ItemSpec target, MergeOptionsEx options,
PathLength maxClientPathLength)
at Microsoft.TeamFoundation.VersionControl.Server.Repository5.QueryMergeCandidates(String workspaceName, String workspaceOwner, ItemSpec source, ItemSpec target, Int32 options, Int32 maxClientPathLength)
Inner Exception Details:
Exception Message: Timeout expired. The timeout period elapsed prior to completion of the operation or the server is not responding. (type SqlException)
SQL Exception Class: 11
SQL Exception Number: -2
SQL Exception Procedure:
SQL Exception Line Number: 0
SQL Exception Server: MIA-TFS01
SQL Exception State: 0
SQL Error(s):
Exception Data Dictionary:
HelpLink.ProdName = Microsoft SQL Server
HelpLink.ProdVer = 12.00.4213
HelpLink.EvtSrc = MSSQLServer
HelpLink.EvtID = -2
HelpLink.BaseHelpUrl = http://go.microsoft.com/fwlink
HelpLink.LinkId = 20476
Exception Stack Trace: at System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
at System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
at System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
at System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
at System.Data.SqlClient.SqlDataReader.get_MetaData()
at System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString)
at System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
at System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean asyncWrite)
at System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
at System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
at System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior)
at Microsoft.TeamFoundation.Framework.Server.TeamFoundationSqlResourceComponent.ExecuteCommand(ExecuteType executeType, CommandBehavior behavior, String performanceGroupName)
Inner Exception Details:
Exception Message: Der Wartevorgang wurde abgebrochen (type Win32Exception)
Exception Stack Trace: