ccm rwa|recon|reconcile -p|-project [-s|-sh|-show]
([-cu|-consider_uncontrolled] | [-iu|-ignore_uncontrolled])
([-mwaf|-missing_wa_file] | [-imwaf|-ignore_missing_wa_file])
([-r|-recurse] | [-nr|-norecurse|-no_recurse])
[-if|-ignore_files|-ignore_types file_type,...] [-f|-format format]
[-nf|-noformat] ([-ch|-column_header] | [-nch|-nocolumn_header])
[-sep|-separator separator] ([-sby|-sortby sortspec] |
[-ns|-nosort|-no_sort]) [-gby|-groupby groupformat] project_spec...
ccm rwa|recon|reconcile [-s|-sh|-show]
([-cu|-consider_uncontrolled] | [-iu|-ignore_uncontrolled])
([-mwaf|-missing_wa_file] | [-imwaf|-ignore_missing_wa_file])
([-r|-recurse] | [-nr|-norecurse|-no_recurse])
[-if|-ignore_files|-ignore_types file_type,...] [-f|-format format]
[-nf|-noformat] ([-ch|-column_header] | [-nch|-nocolumn_header])
[-sep|-separator separator] ([-sby|-sortby sortspec] |
[-ns|-nosort|-no_sort]) [-gby|-groupby groupformat] file_spec..
A keyword can be built in (%fullname, %displayname, %objectname) or the name of any existing attribute such as %modify_time or %status.
See Built-in keywords for a list of keywords.
You can specify additional ignore patterns for an individual project to allow the specification of a set of regular expressions to be ignored by the sync work area operation. In the root directory of the project, create a controlled file called synergy_ignore_file_pattern.txt. This file is read using UTF-8 encoding. The syntax of this file is the same as the syntax used in the GUI Options dialog to define patterns to be ignored.
This option controls the depth of a reconcile operation when you synchronize a project. The depth of a reconcile is important to consider. If you synchronize a top-level project with many nested subprojects, the operation takes a substantial amount of time and resources to recursively reconcile every subproject beneath your specified top-level project.
If you specify a directory and -recurse, subprojects are not reconciled recursively under that directory.
Use this option when you are certain that the work area represents the correct set of changes.
ccm reconcile -p ico_june16-1 -ignore_types "*.doc;*.gif ;*.exe"
For this example, you must update move.c, which was in the working state, and colname.c, which was in the integrate state. After you copied and modified the objects in your work area, the direction of the project changed and you ended up not needing these changes after all.
The work area was updated with the original files from the database, and that the changes made to colname.c and move.c were discarded.
$ ccm reconcile -p ico_june16-1 -no_recurse -uwa
Fetching work area data, 0%...
Checking work area conflicts, 30%...
Discarding changes to '/users/john/ccm_wa/ccmint15/ico_june16-1/ico_june16/src/colname.c'...
Discarding changes to '/users/john/ccm_wa/ccmint15/ico_june16-1/ico_june16/src/move.c'...
Checking work area conflicts, 100%