No warning at merging multiple changesets with same file

Question

Hello experts!

The "TEE 2010 SP1" does not give a feedback if this scenario occures.
Well descriped here: http://social.msdn.microsoft.com/Forums/en-US/tfsversioncontrol/thread/b18b2be8-ac15-4fed-9ccc-c43a12c71705/

Apart from the fact that I don't see a point in not supporting this feature I would like to see a warning message (like VS 2010 does) on that action.

Do I miss something on that or is there really no feedback?

Thanks and all the best,

Martin

Answer 1

I'm having trouble reproducing the warning you're referring to.   Neither VS nor TEE allow you to multi-select non-contiguous changeset from the list.  And both VS and TEE presented me with a conflict dialog.

What's the warning that you see from VS?

Thanks,
Rick

Answer 2

Hello Rick

Thanks for taking time!

You are write that a multi select of non continuous is not possible (sad but true).

The scenario I was talking of is a multiple merge action:

1) merge changeset x
2) leave the pending change "edit, merge" in the pending changes (no check in)
3) try to merge some other changeset (also x+1 is not possible although it would be a valid multiselect candidate)

The message you get under VS is:
"TF203015: The item $/xxx/xxxxxxxxx/xxx/xxxxxxx/.cproject has an incompatible pending change."

Hope you have all the information you need now.

All the best,

Martin

Answer 3

Ok, thank you for the update.  I'll have another look.