Syncing work area with database

When you sync your work area, the files in your work area are compared with the files in the database so you can resolve the differences.

About this task

Use sync if you manually changed files in the file system without checking out the files or if a project update fails because of changes in the file system. Sync the work area to view and select conflicts, then compare the differences between the files in the file system and the database.

The following operation discusses ways in which to resolve work area conflicts after a sync.

To find a project or project grouping, see Finding an object.

Procedure

  1. Right-click over a modifiable project, group of projects, or project grouping, point to Sync Work Area, and select Members Only or Members and Subprojects, whichever is appropriate.

    The Work Area Conflicts dialog box is displayed when there are conflicts.

  2. Review the list of conflicts.
  3. Resolve conflicts in one of the following ways:
    Option Description
    Discard work area changesdiscard work area changes icon Click this icon to discard your work area changes and to update your work area to match the database.
    Keep work area changes keep work area changes icon Click this icon to update the database to match your work area.
    Ignore files you do not want Synergy to control If you see conflicts for files that you do not want to control, you can ignore files by pattern. Doing this sets filters to keep files with specified patterns from displaying as conflicts after you sync the work area.

    If the work area contains many conflicts, you can filter the conflicts. Click membership conflict icon and choose the criteria that you want to view (which filters out the rest of the criteria), such as File, then use the list box to specify the conflict messages you want to view. To see all conflicts again, click membership conflict icon and choose Turn Off Filtering.

    If the column being filtered has 10 or fewer unique values, then the filter value displays in a list box. You can add an existing value; however, you can also enter your own value into that field. If the column has more than 10 unique values, you can enter values in a text field to apply filtering. For information about using Java™ regular expressions to filter the criteria, see Pattern matching and Rational Synergy.

    If you set filters, refresh the output in the Work Area Conflicts dialog box. Click refresh icon in the Work Area Conflicts dialog box to run work area conflict detection again.


Feedback