Re: Integrate from branch to main - howto

This question is not answered.
Replies: 1 - Pages: 1 - Last Post: Nov 4, 2010 9:16 PM Last Post By: ErikWaibel Threads: [ Previous | Next ]
Posts: 1
Registered: Nov 03, 2010 07:27:32 PM Integrate from branch to main - howto
Posted: Nov 03, 2010 07:35:11 PM I have a branch cspec below
element * CHECKEDOUT
element csm5200_apps/release/boaapps_cc.pl .../wizard_boaapps_int/LATEST
element third_party_import/... WIZARD_THIRD_PARTY_TOOLS_V1 -nocheckout
element * .../wizstar_8_3_x_release_branch/LATEST
element * INTEGRATION_BOAAPPS_10.09.00.19 -mkbranch wizstar_8_3_x_release_branch
element * /main/LATEST -mkbranch wizstar_8_3_x_release_branch

And I have several label that I want to merge back to main.

How can I do that from the command line?
The new files/dir added to the branch must also be merged.

Thanks!

Posts: 3
Registered: Nov 04, 2010 09:14:12 PM Re: Integrate from branch to main - howto
Posted: Nov 04, 2010 09:16:55 PM   in response to: edinei's post In order to do this, you must create a View with the config spec setup (view1) so that it contains all the labels/branches that you want to merge from into /main. After that, you can then go into a View that is only looking at /main (view2) and run the following command:

> cleartool findmerge -all -ftag other options

That should merge all versions that view1 is looking at into all versions that view2 is looking.

Use the search field to find all types of content in My developerWorks with that tag.

Use the slider bar to see more or fewer tags.

Popular tags shows the top tags for this particular type of content or application that you're viewing.

My tags shows your tags for this particular type of content or application that you're viewing.

Use the search field to find all types of content in My developerWorks with that tag. Use the slider bar to see more or fewer tags. Popular tags shows the top tags for this particular type of content or application that you're viewing. My tags shows your tags for this particular type of content or application that you're viewing.MoreLess 

View the original article here