1

So lets say i have the following directory:

- Dlls
- Globals
- App1
- App2

Where "Globals" and "Dlls" are sources shared between App1 and App2.. Now lets say i have an apllication called "Application 01" which consists of the folder App1, Globals and Dlls.

I can make the following workspace view..

//depot/release_1.0/App1/...  //workspace/Application01/release_1.0/App1/...
//depot/release_1.0/Dlls/...  //workspace/Application01/release_1.0/Dlls/...
//depot/release_1.0/Globals/...  //workspace/Application01/release_1.0/Globals/...

And it is all good.. i can sync, edit and work with the files as expected...

The release_1.0 has been launched and i want to propagate the changes to my MAIN. Apparently i can't merge to my MAIN because its not in my client view...

However i do not want to keep MAIN inside my Workspace local directory... Otherwise i'd need to have the following view:

//depot/release_1.0/App1/...  //workspace/Application01/release_1.0/App1/...
//depot/release_1.0/Dlls/...  //workspace/Application01/release_1.0/Dlls/...
//depot/release_1.0/Globals/...  //workspace/Application01/release_1.0/Globals/...
//depot/MAIN/App1/...  //workspace/Application01/MAIN/App1/...
//depot/MAIN/Dlls/...  //workspace/Application01/MAIN/Dlls/...
//depot/MAIN/Globals/...  //workspace/Application01/MAIN/Globals/...

Is this is the only way i could merge the changes to Main?

4

1 回答 1

1

You only need the destination of your integration to be in your Workspace view. So, when integrating to Main, switch to your Workspace View that just contains Main, that way you don't need to "mix" views.

于 2013-10-04T13:26:24.010 回答