TFS Merge: Cannot discard a changeset - by Alf Kåre Lefdal

Status : 

  Duplicate<br /><br />
		This item appears to be a duplicate of another existing Connect or internal item.<br /><br />
		A more detailed explanation for the resolution of this particular item may have been provided in the comments section.


3
0
Sign in
to vote
ID 739780 Comments
Status Closed Workarounds
Type Bug Repros 0
Opened 4/29/2012 1:12:22 PM
Access Restriction Public
Moderator Decision Sent to Engineering Team for consideration

Description

We have a changeset where the developer has checked in changes to both source and target branch, many changes including renames in both branches. The merge of the the changeset from source to target branch goes fine, but the changeset remains in the list of changesets to be merged.

When I now try to merge the changeset again, it says "There are noe changes to merge.". And the changeset remains in the queue.

We have tried to use the command line tool to discard the changeset like this:

C:\src\project\sourceBranch>tf merge /discard /recursive /version:C8137~C8137 $/Project/sourceBranch $/ Project/targetBranch

This did not help. We have also tried using other options like /force and /baseless with no luck.

See problem as first published on stackoverflow: http://stackoverflow.com/questions/10349483/tfs-merge-cannot-discard-a-changeset
Sign in to post a comment.
Posted by Matthew [MSFT] on 8/2/2012 at 7:59 AM
Thanks for reporting this issue. We've determined that this is the same root cause as another issue we're already in the process of fixing, so you'll see this fix in a future release.

Thanks,
Matt
Program Manager | TFS Version Control
Posted by Alf Kåre Lefdal on 5/14/2012 at 6:11 AM
For some strange reason the changeset has now disappeared as a merge candidate. I have no idea why. The TFS-version is the same as before.
Posted by MS-Moderator01 on 4/29/2012 at 7:16 PM
Thank you for your feedback, we are currently reviewing the issue you have submitted. If this issue is urgent, please contact support directly(http://support.microsoft.com)
Posted by MS-Moderator07 [Feedback Moderator] on 4/29/2012 at 7:13 PM
Thanks for your feedback.

We are rerouting this issue to the appropriate group within the Visual Studio Product Team for triage and resolution. These specialized experts will follow-up with your issue.