CODEWITHSUNDEEP
version-controltfsmergebranch
karoberts
karoberts

Reputation: 9938

tfs merge missing changeset yet they were merged

I'm seeing some strange behavior from TFS and I'm trying to understand what it is telling me.

I have two branches, $/Project/trunk and $/Project/master (trunk is branched from master)

A merge was done this way, merging everything from trunk to master.

tf merge $/Project/trunk $/Project/master /recursive

Example tf history $/Project/trunk /recursive

12        Dev C         10/1/2015  message
11        Dev B         10/1/2015  message
10        Dev A         9/30/2015  message

Yet, tf merges $/Project/trunk $/Project/master /recursive shows

Changeset Merged in Changeset Author                           Date
--------- ------------------- -------------------------------- ----------
       10                 526 Dev A                           10/15/2015
       12                 526 Dev A                           10/15/2015

So what happened to changeset 11 ???
- It was clearly merged (tf merge /candidate does not show it).
- It is clearly in the history of trunk

Yet it does not show as merged in the merge tracking? Why?

BTW: I'm using TFS 2013, with tf.exe from Visual Studio 2015

Upvotes: 0

Views: 2411

Answers (1)

Eddie Chen - MSFT
Eddie Chen - MSFT

Reputation: 29958

Clear the TFS Client cache (The cache folder locate in C:\Documents and Settings[USER]\Local Settings\Application Data\Microsoft\Team Foundation\4.0\Cache on your development machine), and then double check if changeset 11 still exist in trunk. By the way, what is the version of the TFS you are using?

Upvotes: 1

Related Questions