You can use the Pending Changes panel
to manage unresolved local changes in the loaded repository workspace.
You can open the Pending Changes panel from the Repository
Workspaces panel or the Repository Workspace
List Actions panel.
About this task
If you change local resources in a loaded repository workspace,
you can see all of the pending changes on the Pending Changes panel.
From the Pending Changes panel, you can check
in the complete list of unresolved changes, or you can work with a
specific unresolved change individually.
Procedure
- On the Repository Workspaces panel,
you can enter a P next to a repository workspace
and press the Enter key to display all of the unresolved changes for
that workspace. You can also display the unresolved changes by entering
a forward slash (/) next to one of the workspaces. On the Repository
Workspace List Actions panel, enter 10 in
the workspace action field and press the Enter key.
- On the Pending Changes panel, check
in all of the unresolved changes by entering a forward slash (/)
next to the Checkin All field.
- Optional: To work with an individual
unresolved change, enter one of the following shortcut characters
next to one of the listed pending changes:
- C
- Check in the file that contains the unresolved change.
- R
- Replace the changes that are made to the file with the content
of the file in the repository workspace.
- H
- Display a history of the file that is affected by the unresolved
change.
- CP
- Compare local changes that are not checked in to the previous
version of the resource in the sandbox.
- CA
- Compare, in ASCII, local changes that are not checked in to the
previous version of the resource in the sandbox.
- CU
- Compare, in UTF-8, local changes that are not checked in to the
previous version of the resource in the sandbox.
Comparing the file opens the file
in an editor session. Changes in the local and remote files are noted
in the editor, along with instructions to identify in which file the
differences exist. You can use the information about the changes in
the files to merge the local and remote file changes as you want to
include them.
- Optional: On the Pending Changes panel,
enter a forward slash (/) next to a specific unresolved change to see a menu
of actions for that change.
On the
Pending Changes
List Actions panel, you can do the same actions as on
the
Pending Changes panel, but with different
input characters:
- 1
- Check in the file that contains the unresolved change.
- 2
- Replace the changes that are made to the file with the content
of the file in the repository workspace.
- 3
- Display a history of the file that is affected by the unresolved
change.
- 4
- Compare local changes that are not checked in to the previous
version of the resource in the sandbox.
- 5
- Compare, in ASCII, local changes that are not checked in to the
previous version of the resource in the sandbox.
- 6
- Compare, in UTF-8, local changes that are not checked in to the
previous version of the resource in the sandbox.