There is a useful documents about the usage of development branches in your site. We use PowerBuilder as IDE and the merge of 2 development branches is a mess there. After I checked out all elements in the head branch, I use the "get latest version" of the root project target element (IDE does not allow me to use the parent workspace element), I do select all elements, then among the advanced options, I use the "update options"/merge with the tag name of the bug branch. The main problem is that the update (merge) really runs just on the selected elements, if there are new elements in the bug branch, those elements are not inserted into the head branch during the merge. Similarily the erased (from cvs) elements (in bug branch) are not removed in the head branch. To be frankly I do not know how it could be done. Perhaps if all elements are selected in the list, not the objects must be updated one by one, but their first common parent directory. Or is this idea against the possibility of the PowerBuilder IDE? The other problem is that with CVSSCC 2.0.x I could use the conflict resolver during merge, the problematical objects really automatically invoked it. Nowadays it does not work at all. Please take a look at the attached test scenario I made. Due to the mentions problems I have to run the complete merge process outside the PowerBuilder IDE (in WinCVS). Do you think it can be done ever in PowerBuilder IDE?
|