Tf10141: No Files Checked in: Resolve the Conflicts and Try Again.

If you run into a TFS bank check-in failure conflict blazon and yous try the first option of "Retry the action".

Figure: This disharmonize is generated during the final checkin.

The migration exists and you are left with some Purple columns in the UI.

Figure: Nice green UI covered with regal crap

This is followed by a strong sinking feeling after fourteen hours of babysitting the migration… in that location are only 96 items left to go…

• Update 2012-08-22 – I messed upwardly on the final dialog… thanks to Jameson Miller for spotting this one.

Applies to

• TFS Integration Tools (March 2012 Release)

Findings

Your first idea will be to click "Start" and run the migration again and it tells you that there are 96 items to exist migrated.

Figure: Its going… its going…

Later on which you will be greeted with a "your migration was successful", merely don't be fooled. This migration…. it is lying to you…

You need to look at the logs at present, and low and behold:

Checkin failed – TF14080: The item '$/Xxx XXXX/XXX/Version4_0-Next_Build/XXXAdmin/App_WebReferences/XXXXXXXWCF/Reference.svcmap' has a pending merge / rollback conflict, run resolve earlier checking in.

To start moving forwards nosotros need to move back… delete the rule ("View Conflicts | View Rules") and click "Commencement" again.

Effigy: Delete this rule that you only added

And we cease up dorsum at the conflict resolution screen, but now armed with the noesis that "Retry this action" is non going to work.

Figure: See… back to the start…

Now we need to specifically solve the problem and this problem is a gnarly one. Nosotros need to await at what is currently pending in TFS.

Effigy: Figure out what is conflicting

At present while you can do this from the control line that is something that I am not comfortable with (sorry… not one-time enough ) but I can open TFS under that user account and resolve the disharmonize…

Figure: TFS Sidekicks to salvage the twenty-four hour period.

If similar me you are command line adverse, then you tin can install the Team Foundation Sidekicks along with the TFS 2010 API and proceeds access to the data that you lot are looking for. In this instance it besides tells me the Workspace that I need to load…

Figure: Load the offending workspace

Now we need to figure out the problem. To do that we demand to look at the offending change and manually resolve the conflicts.

Figure: Woops they are not the same

This is an consequence as the change from the original files is not replicated correctly. This could indeed exist a big in TFS, the TFS Integration Platform or both but that pocket-sized comfort does not aid me at present…

Solution

To motion past this nosotros need to manually resolve the conflicts and check-in. Nosotros tin so take the original source check-in and forth with the new target changeset resolve the conflict in the Integration Platform.

Figure: Resolution causes TF14092

Attempting to resolve the conflict in favour of the source by clicking "Take Source Branch Version" runs into the aforementioned problem that the TFS Integration Platform likely ran into when it was trying to achieve the same result.

Resolution causes TF14092: The item $/XXX/ cannot be changed. A parent of this particular has a awaiting delete which must be checked in first.

This to me looks like it was because of the order that VC committed items  in TFS 2008 and how it is now committed in TFS 2012. If that is the example so the argument for which service the bug is in could be made either way…

However clicking "Accept Target Brach Version" results in a successful merge but will go out those files in source command afterwards the operation. I can still continue track of this additive data and resolve information technology permanently by deleting them as part of a clean up at the end..

Figure: Use the following changesets for the source and target system

At present that I take manually resolved the issue I can go dorsum to my conflict in the TFS Integration Platform and manually wire up the source check-in to the target one that I but manually checked in…

<alert>

In the context of this Conflict the Source does not refer to the Migration Source as you would think. It relates to the Source of the Conflict instead and in this instance it is the "Migration Target". So the source is the Migration Target and the Target is the Migration Source… and are we confused yet, coz I was!

Reference: TFS Integration Tools – VC Conflict "A namespace disharmonize has been detected" … what at present?

Afterward Jameson pointed this out to me I was muttering like a Pirate that has stubbed his toes for at least an hour…

<warning>

Did this solve your conflict?

murillowastumpaboos.blogspot.com

Source: https://nkdagility.com/blog/tfs-integration-tools-issue-tf10141-no-files-checked-in-as-a-result-of-a-tfs-check-in-failure/

Share this post