Moved main, merge not working with existing branches

Question

Hi,

Here is the thing, we used to have a version control tree like this:

Main
    vcproj1
    vcproj2
Releases
    v1
        vcproj1
        vcproj2

We had to change the global project source structure, so we moved in tfs


vcproj1
    Main
vcproj2
    Main
Releases
    v1
        vcproj1
        vcproj2

As you can see, existing releases remains unchanged (of course they are already gone to our customers).
Until now everything worked fine, unfortunately we had to fix a bug in v1, and wanted to merge it to the main.
Previous tests showed us an item (src file) from vcproj1 (in v1) actually get merge correctly to the new main structured... bug it's not the case anymore

Let's say I have file.cpp : Releases/v1/vcproj1/file.cpp
The merge wants to merge it to the old path: Main/vcproj1/file.cpp instead of vcproj1/Main/file.cpp

Is there an explanation ? normal behavior?

Additionnal information:
if I use the "tf merge" command line tool, and specify the destination path it works (I didn't specified /baseless merge). So I guess both file.cpp are still correctly related somewhere.
We use TFS2008

Answer 1

Not sure I understand how you restructured things.  Which Main folder is the moved version of what used to be at $/Main, and how did you create the 2nd one?

In any case, it's normal when merging a rename for the pending change to show the old path with a changetype of "merge."  Only after you've resolved the conflict will the path be updated (and the changetype becomes "merge, rename" or "merge, rename, edit", assuming you chose one of the options that changes the name).

Answer 2

the old $/Main is now splitted up.
there used to be $/Main/vcproj1, it became vcproj1/Main
and $/Main/vcproj1,is now in vcproj2/Main

We had to do so because these vcproj are now living independant life (releases are different)
I'm not sure the resolve conflict box showed up when I tried to merge the renamed vcproj1 content... I'll try again and see