Synchronize wizard Changes page

On the Changes page of the Synchronize wizard, review the changes between the work area and the project/stream, override default selections, and resolve any conflicts.

Toolbar

The toolbar provides the options for handling differences.

Field Description
Previous Difference previous_difference_button.gif Select the previous item file where there is a difference.
Next Difference next_difference_button.gif Select the next item file where there is a difference.
Previous Unresolved previous_conflict_button.gif Select the previous item file that has a conflict where no resolution has been selected.
Next Unresolved next_conflict_button.gif Select the next item file that has a conflict where no resolution has been selected.
Compare compare_button.gif Launch the file merge tool to compare the file in the work area with the item file in the repository.
Hide Unchanged hide_unchanged_button.gif Unhide item files that have a Change Type of Unchanged.
Hide Ignored hide_ignored_button.gif Unhide item files that have a Resolution of Ignored.
Repository View repository_view_button.gif Display only the item files in the repository.
Work Area View work_area_view_button.gif Display only the item files in the work area.
Consolidated View consolidated_view_button.gif Display the item files in both the repository and in the work area.
Ignore ignore_button.gif Ignore the selected file or folder so that it is not included in the synchronization.

Merge file_merge_button.gif

Launch the file merge tool and merge the file in the work area with the item file in the repository.

Note: For certain types of conflict relating to a move and modification, an Accept option is available with the following options:

  • Rename and modification.

  • Just the modification.

Use Local use_local_button.gif Use the version of the selected file or folder from the work area.
Use Repositoryuse_repository_button.gif Use the version of the selected file or folder from the repository.

Back to top

Files and Folders area

The Files and Folders area displays the following information.

Field Description
Filename Icon and file name.
Change type A description of the type of change between the work area and the repository.
Resolution The currently chosen action to be taken for the change.
Changed in Consolidated view only: Whether the change is in the work area or repository.
Original Filename If the name of the file has changed, displays the original file name.

Back to top

Defaults tab

Use the Defaults tab to specify default options for items/files.

Field Description
Comment A comment to be used if a new item revision is being created in the repository.

Relate to request(s)

One or more requests to relate as In Response To new item revisions created in the repository.

Use the browse button to select the request(s).

<Use default> means your default request for the project/stream is used.

Permissions after update The permission to be given to files after they have been copied to the work area. Choose between Make read only and Make writable.

Design part for new files

The part specification for the owning design part for new items created in the repository.

Use the browse button to select the design part.

<Use default>  means the default design part for the project/stream is used.

Permissions after Deliver

The permission to be given to the file in the work area after it has been delivered to the repository.

Choose between Make read only and Keep unchanged.

Apply date/time of

The timestamp to be applied to files that are copied to the work area.

Select Repository item if you want the date/time of the updated files in the work area to have the same value as the item in the repository.

Select Current system if you want updated files in the work area to have the current date and time.

Expand substitution variables

Select this option if you want item header substitution variables expanded when an item file is updated in the work area.

Item headers are expanded only if the item type has Enable item header substitution set in the Administration Console.

Back to top

Options tab

Use the Options tab to override the default options for the selected file/folder.

Field Description
Comment A comment to be used if a new item revisions is being created in the repository.

Requests

The request(s) to be related to a file if it is being delivered to the repository.

Use the browse button to select the request(s).

<Use default> means your default request for the project/stream is used.

New revision The new revision for a file if it is being delivered to the repository.
Item specification The item specification for a new item. Displayed only if a new item is to be created.

Item type

The item type to be assigned to a new item. Displayed only if a new item is to be created.

Accept the default or click the field and select another item type from the list.

Format The file format for a new item. Displayed only if a new item is to be created.
Permissions after Update The permission to be given to files after they have been copied to the work area. Choose between Make read only and Make writable.

Design part

The part specification for the owning design part for new items created in the repository. Displayed only if a new item is to be created.

Use the browse button to select the design part.

<Use default> means the default design part for the project/stream is used.

Permissions after Deliver

The permission to be given to the file in the work area after it has been delivered to the repository.

Choose between Make read only and Keep unchanged.

Back to top

Properties tab

Use the Properties tab to view the details of a selected file or folder.

Field Description
Details A description of the change or conflict.
Local item specification The item specification from which the file in the work area originated.
Repository item specification The item specification of the file in the repository.
Originator The user that created the item revision in the repository.

Back to top

See also: