Accidental Technologist

Musings about Entrepreneurship, Technology and Software Development

  • Home
  • About
  • Still River Software
  • Privacy Policy

Powered by Genesis

You are here: Home / Visual Studio / Unexpected Behavior in Team Foundation Server and Visual Studio Merge Functionality

Unexpected Behavior in Team Foundation Server and Visual Studio Merge Functionality

November 8, 2007 by Rob Bazinet

Tweet

So, for one of my clients we use Team Foundation Server for our source control, overall it’s pretty good.

I am working on a project for a client and we have two versions of the application.  The new version is the one in active development but we still need to fix bugs and make some feature updates to the original version.  The new version was created by branching from the original.

Our updates to the original source tree need to be moved over and I planned to use the TFS Merge Feature.  I got ready to start my updates to the new source tree and on my first merge attempt I received this error:

TeamFoundationError 

Error : The merge target {0} is not mapped

I stared at the error for a bit wondering what the heck could be wrong with my source control configuration, as it’s the same as so many other developers on the project.

My usual path to problem resolution is to do a web search and if that fails then ask around the team.   The result of talking with our team of consultants resulted in it working on some systems but not on others.  The interesting thing was the difference in configuration between the have’s and have-not’s, the ones that worked were accessing both branches from the same TFS Workspace, but those that did not work had their environment broken up into two workspaces.  This was my configuration.

I started looking around at the TFS Object Model Documentation on Microsoft’s MSDN site and found the Workspace class and realized the Merge() method was on this class, which would mean, or imply, inter-Workspace merging is not supported.  Here is a snippet from the MSDN Library:

TFS_Merge

This clearly shows where the Merge() method belongs.  I changed my configuration and removed the second Workspace:

TFS_Workspaces

Workspace #1 looks like this:

TFS_WS1

Workspace #2 looks like this:

TFS_WS2

And the two combined into just one Workspace:

TFS_WS3

This changed worked beautifully.  I am a bit surprised you can do inter-Workspace merging or a least I could not find one.  I can now Merge easily amongst my branches.

Technorati Tags: Team Foundation Server, TFS, Visual Studio, Microsoft

Share this:

  • LinkedIn
  • Twitter
  • Facebook
  • Email
  • More
  • Pinterest
  • Tumblr
  • Pocket
  • Reddit

Related

Filed Under: Visual Studio

Care about your privacy? I do and use Fathom Analytics on this site.

Fathom Analytics

Recent Posts

  • How to Fix Rails Flash Rendering When Using Hotwire
  • Hotwire Fix for CORS Error when using Omniauth
  • Fix Installation of Ruby using rbenv on macOS Big Sur
  • RailsConf 2021 and the Future of Conferences
  • Fixing Out of Diskspace Errors on Amazon EC2

Categories

Services I Love

HatchBox - Easy Rails Deploys Fathom Analytics
Follow @rbazinet

Rob Bazinet
@rbazinet

  • Exactly this…. https://t.co/yWj7fZ01HR
    about 17 hours ago
  • https://t.co/EmagdpLoNv "Introducing GitHub Copilot X · GitHub"
    about 1 day ago
  • RIP Gordon Moore: https://t.co/c5J9LaHrj8
    about 1 day ago
  • Our daughter works as a teaching assistant at a local K-8 public school. It’s become apparent that students today r… https://t.co/p2t912GVyc
    about 2 days ago
  • Working to wrap up my current consulting gig by mid-April. I will be looking for the next thing soon. If anyone has… https://t.co/sg3cSV9yqM
    about 3 days ago
  • RSS - Posts
  • RSS - Comments
Find me on Mastodon