While you are working on a IBM® Rational® Rhapsody® unit
in Eclipse, other members of your team might have committed changes
to the copy of the unit in the Concurrent Versions System (CVS) repository.
To get these changes, you can update your Rational Rhapsody unit
to match the repository.
About this task
You can do this in the following ways:
- Right‑click the unit in the Unit View window and
select .
- Switch to the Synchronization perspective. Right‑click
the unit, and select Update.
Eclipse lets you configure the Update operation
to do one of the following choices:
- Update all non‑conflicting changes and then
preview the remaining changes: All non‑conflicting incoming changes
will be merged in automatically and any remaining conflicts will be
displayed either in the Sync View window (default) or in a window.
You can specify where to display conflicts through the Update/Merge
Preference window.
- Preview all incoming changes before updating: All
changes will be displayed in either the Sync View window or a window
(depending on your settings).
- Never preview and use CVS text markup to indicate
conflicts: This option will automatically merge all changes without
any user interaction. Conflicting changes will be merged in using
the CVS text markup:
<<<<<<< original file revision
[original code]
= = = = = = =
[incoming code]
>>>>>>> incoming file revision
Note: Do not configure Update to use the Never
preview and use CVS text markup to indicate conflicts option
because doing so will corrupt the repository with CVS text markups.
Restriction: After doing , new descendants become
unresolved in the model although they exist on the hard disk. To remedy
this situation, after doing the update, right‑click the unresolved
unit in the Rational Rhapsody browser
and select Load with descendants.
Procedure
To configure how the Update operation
behaves:
- Open the Preferences window. Choose .
- Expand and make your selection on the Update/Merge pane.
- Click OK.