Delete merge history in a branch in TFS

Posted by JMarsch on Stack Overflow See other posts from Stack Overflow or by JMarsch
Published on 2010-06-10T20:48:09Z Indexed on 2010/06/10 20:53 UTC
Read the original article Hit count: 614

Filed under:

visual-studio

|

version-control

|

tfs

Suppose I have a main branch and a dev branch. Suppose I merge some stuff from dev into main.

I check in the merge
Now I decide "whoops, the dev branch wasn't really ready for me to merge into main yet."
I want to tell TFS: remove that change set from main and forget that the merge ever happened.

Rolling back the changeset is easy enough -- I can use the TFS powertools ROLLBACK command. on the Main branch (with the /changeset /recursive flags)

However, I will get a warning from the rollback that the merge history for the files has not been deleted.

Effect: Later, when dev is ready to be merged into main, the changes in the files that were rolled back previously are NOT merged into Main (this is because TFS "thinks" that those merges are already done.

My goal: When I rollback, make TFS remove the merge history so that when I merge dev into main later on, everything merges.

How can I do that?

BTW: I'm using TFS 2008 SP1

© Stack Overflow or respective owner

Related posts about visual-studio

The Visual Studio development environment crashes when you open Visual Studio 2005, Visual Studio 20

as seen on Dot net Slackers - Search for 'Dot net Slackers'
983279 ... The Visual Studio development environment crashes when you open Visual Studio 2005, Visual Studio 2008, or Visual Studio 2010This RSS feed provided by kbAlerz.com.Visit kbAlertz.com to subscribe. It's 100% free and you'll be able to recieve e-mail or RSS updates for the technologies… >>> More
The Visual Studio development environment crashes when you open Visual Studio 2005, Visual Studio 20

as seen on Dot net Slackers - Search for 'Dot net Slackers'
983279 ... The Visual Studio development environment crashes when you open Visual Studio 2005, Visual Studio 2008, or Visual Studio 2010This RSS feed provided by kbAlerz.com.Visit kbAlertz.com to subscribe. It's 100% free and you'll be able to recieve e-mail or RSS updates for the technologies… >>> More
Visual Studio 2008 Professional with MSDN Professional to Visual Studio 2010

as seen on Stack Overflow - Search for 'Stack Overflow'
With Visual Studio 2010 right around the corner, what does Visual Studio 2008 Professional with MSDN Professional upgrade to in Visual Studio 2010? Do I get 2010 for free, if I buy this flavor of 2008 now? >>> More
C# development with Mono and MonoDevelop

as seen on Developer IT - Search for 'Developer IT'
In the past two years, I have been developing .NET from my MacBook by running Windows XP into VM Ware and more recently into Virtual Box from OS X. This way, I could install Visual Studio and be able to work seamlessly. But, this way of working has a major down side: it kills the battery of my laptop…… >>> More
ASP.NET MVC 2 Released

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
I’m happy to announce that the final release of ASP.NET MVC 2 is now available for VS 2008/Visual Web Developer 2008 Express with ASP.NET 3.5. You can download and install it from the following locations: Download ASP.NET MVC 2 using the Microsoft Web Platform Installer Download… >>> More

Related posts about version-control

In the context of the TFS version control SDK (Microsoft.TeamFoundation.VersionControl), what exactl

as seen on Stack Overflow - Search for 'Stack Overflow'
In the context of the TFS version control SDK (Microsoft.TeamFoundation.VersionControl), what exactly is deletionID? It is a property of Microsoft.TeamFoundation.VersionControl.Client.Item. It is also a parameter to some of the query methods on Microsoft.TeamFoundation.VersionControl.Client. I'm… >>> More
What are the advantages of version control systems that version each file separately?

as seen on Programmers - Search for 'Programmers'
Over the past few years I have worked with several different version control systems. For me, one of the fundamental differences between them has been whether they version files individually (each file has its own separate version numbering and history) or the repository as a whole (a "commit" or… >>> More
What are the advantages of version control systems that version each file separately?

as seen on Programmers - Search for 'Programmers'
Over the past few years I have worked with several different version control systems. For me, one of the fundamental differences between them has been whether they version files individually (each file has its own separate version numbering and history) or the repository as a whole (a "commit" or… >>> More
R and version control for the solo data analyst

as seen on Stack Overflow - Search for 'Stack Overflow'
Many data analysts that I respect use version control. For example: http://github.com/hadley/ See comments on http://permut.wordpress.com/2010/04/21/revision-control-statistics-bleg/ However, I'm evaluating whether adopting a version control system such as git would be worthwhile. A brief overview: I'm… >>> More
What version control tool can generate this header

as seen on Stack Overflow - Search for 'Stack Overflow'
This is from a sql script. What tool can generate this? Thanks --USE [MY_TABLE] GO /****** Object: StoredProcedure [dbo].[adminIncExp] Script Date: 03/05/2010 09:14:12 ******/ SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON GO -- ============================================= -- Author: … >>> More