This is what I did. If there is a better way, answer.
Below are the steps that I followed:
- I started my Android project in a random folder (workspace) and did my initial development.
- Then I wanted to move the project under my development branch to
$root/Development/MyBranch/Android - The Android folder does not exist, so I created TFS. If you do this manually from Explorer, then TFS will not allow you to create it on the server side.
- In the original workspace of the project, I made "Export" → "General | Preferences", in some folder.
- Then I did "Switch Workspace" → "Other" I specified the local path
$root/Development/MyBranch/Android - Now I get an empty workspace.
- Then I did “Import” → “Project Settings” and indicated the file that I exported earlier.
- Then I did "Import" → "General | Existing projects in the workspace" with "Copy projects to workspace".
- Surprisingly, I got my project and started working from a new location with several icons, as usual.
- Then I did "Team | Share Project ..."
- I followed the master.
- There is a crazy screen about creating a new workspace. Just hit EDIT and make sure the TFS root mapping is ok.
- Finish the wizard, and you have done so far.
- When you start the project, the plugin will also add the gen and bin folders to TFS. Do not try to fight it, just check them out. More details later.
- At this point, I have everything checked, so I merged with Main.
- At this point, I want to merge the project into another developer branch.
- The process is similar.
- Using TFS creates the $ root / Development / OtherDev / Android folder.
- Launch Eclipse on the developer's computer and do "Switch workspace" → "Other"
- Specify the local path $ root / Development / OtherDev / Android
- Now you get an empty workspace.
- Then "Import" → "Project Settings" and specify the settings file exported earlier (I included it in TFS for reference).
- Then "Import" → "General | Existing projects to the workspace" with "Copy projects to workspace" and copy the project from the local folder $ root / Main / Android
- Then do "Team | Share Project ..." to connect the project to TFS.
- Now close Eclipse.
- Merge
$root/Main/Android to $root/Development/OtherDev/And - Check
$root/Development/OtherDev/Android
Guess it looks like you are done. If I didn’t do something wrong, but it "works on our PCs", for now.
Special note. Since Eclipse / TFSPlugin will always try to add gen + bin dirs to the original control, just keep them always checked, and even if you ever check them, do not merge them back to the main one. It is just a waste of disk space on TFS that combines these files.
This method is so complicated that it just doesn't feel good. Is there a better way to get the same results?
Thanks!
source share