index > Team Foundation Server - Version Control > URGENT: Error when merging changes after folder move

URGENT: Error when merging changes after folder move

Recently we faced with an error which preventing us from merging changes. This issue is quite urgent for us.

We had a main source tree under folder $/P5/RC and several version branches under $P5/R9, $P5/R10 and so on. We created new team project named "P7" and moved main source tree into it via move operation (to folder $/P7/RC). Now when we trying to merge any changeset to version branch (for example $/P5/R9) performed BEFORE moving main tree to the new project we are getting the following error:

The item $/P7/RC does not exist at the specified version.

It seems to us that TFS do not take into account move operations when trying to get specific version of items during changeset merging.

Vladimir Bougay

Vladimir,

This reminds me of a bug we already fixed. Are you running the RTM version (50727.147)?

Richard Berg MSFT

Yes.

I've already contacted MS support (Russia) regarding this issue and they have opened support incident for this case. Anyway direct response from product team can speed up issue resolution. Is there hotfix or patch available for this issue? Any assistance will be great for us because we couldn't release patches for our own product in normal way. Now we forced to manually transfer changes from main development tree to version trees. Our release manager seriously unhappy about that.

Vladimir Bougay

I've confirmed, we did fix this bug between RC and RTM. Installing the RTM version of Team Foundation should resolve the issue.

Richard Berg MSFT

Unfortunately we are running TFS RTM bits and bug is here. We installed it on the clean machine. Just one note which could be important. We started from TFS RTM trial version,but then upgraded it to full version entering product code received with Certified Partner pack.

Until this incident all worked fine, no errors at all.

This error could be reproduced by perfoming the following steps:
1. Create new team project P5
2. Create SCC folder $/P5/RC and put some content into it
3. Branch $/P5/RC folder to $/P5/R9 folder
4. Make some changes in $/P5/RC folder
5. Create new team project P7
6. Move $/P5/RC to $/P7/RC location
7. Try to merge only one specific changeset (not latest version) from $/P7/RC folder to $/P5/R9 folder. This changeset should be commited BEFORE move operation. Error described above appears. We tried to use both Source Control Explorer and TF command line tool

Vladimir Bougay

I see the problem. Sorry to doubt you.

There was a bug where, after renaming the root of a branch, Merge wouldn't find changesets committed before the rename. When we fixed it, we decided that we would resolve the name using the end

Richard Berg MSFT

Thank you very much, Richard.

Your solution works fine for us. At least it allows to us to merge changes with minimal overhead comparing to Source Control Explorer UI. Hope this bug will be fixed in SP1.

Vladimir Bougay

reply 7