You can compare the files in your work area with
your database files. Discrepancies between the work area contents
and the database are called work area conflicts. The reconcile command
identifies these work area conflicts and resolves them to make your
work area consistent with the database.
Work
area conflicts occur in these cases:
- You modified a file in your work area, regardless
of whether you checked it out.
- You changed the database copy of a file from another
work area and you changed the same file in this work area.
- You changed a file in the database, but the work
area being updated was unavailable to update.
- You created a file in the work area, but did not
place it under source control.
- You checked in a file from another work area, but
the work area was unavailable to update with changes.
- You removed a file from the work area, but did not
delete it from your project.
Additional errors can occur with controlled
links and symbolic links and the work area paths. You must manually
resolve these types of conflicts.
A few other
ways to use this command with files that are checked out include:
- If your work area is on a laptop and you are able
to work disconnected, use the reconcile command to
sync your work area and the database.
- On UNIX, if a tool you are using breaks the links
between objects you are modifying and the database, the reconcile command
reconciles the changes and reestablishes the links.
For example, if you are not running a session
but you must modify a non-modifiable object, you can change the object
in your work area. You can update the database later by resetting
the Read Only attribute on the file and modifying it. Later, when
you start a session, use the reconcile command to
update your database with the work area changes.
Note: To stop
a reconcile from the CLI, enter <CTRL+C> at any
time.
When you stop the reconcile from the
CLI, a message displays stating that errors might occur in your work
area. The errors do not occur until you try to use the work area.
To avoid problems, reconcile the work area before you use it.
Some operations perform some reconcile actions automatically:
- A file is checked in and a context project was available.
The
corresponding work area is examined for work area conflicts. Where
possible, changes to the work area are used to update the database automatically.
- A modifiable file is changed in a work area, and
a different version is used as a result of a ccm use or ccm
update_members command.
The database is updated with the
changed file contents from the work area.
- A static file is changed in a work area and then
checked out.
The updated work area contents are used to update the
checked out file.
- The database is updated with new contents from a
work area file.
Any projects that are modifiable by you that use
that file and that have work areas that are visible and modifiable
are updated with the new contents. The update occurs when the database
is either updated explicitly by a ccm reconcile command,
or automatically as part of other operations.
The reconcile command supports
these subcommands: