Community
Participate
Working Groups
The new "Update with Tag" in 3.0 functionality is *fabulous*. This is a request for equivalent functionality for the synchronize functionality. The reason for this request is that Update (from the navigator view) does a blanket update of all files, and I need to be able to update to a different branch while watching/moderating the updates that come in to make sure that everything is kosher (we usually develop on multiple branches).
Ack. The first two lines should read: The new "Update with Tag" functionality in 3.0 is *fabulous*. This is a request for equivalent functionality for synchronize (synchronize with repository).
That is what the Team > Merge support will provide. Running the command will synchronize your local against another branch, you can decide which files to update. If you pin the merge, it will remain in the sync view between workbench restarts.
Team->Merge requires a branching tag and seems to follow the standard CVS workflow for merging. I don't want that, I just want to update with another branch, but want to see what the incoming changes are and have the option to accept/reject individual changes.
In CVS parlance the update command is also a merge. What you want is to be able to merge using one tag. Or you could run a compare against the branch you case about and this will provide the preview you want and you can update changes from there. Marking as dupe of bug 65520. *** This bug has been marked as a duplicate of 65520 ***