Showing work area conflicts

You can identify and show work area conflicts; however, you cannot use this command to perform any action to resolve conflicts.

About this task

ccm rwa|recon|reconcile -p|-project [-s|-sh|-show]
        [-cfc|-compare_file_contents] 
        ([-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] 
        [-cfc|-compare_file_contents] 
        ([-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..

-cfc|-compare_file_contents

This option applies to version 7.2.1.3 or later. Specifies that the contents of file in addition to the timestamp are considered while comparing a static file in the database with the corresponding work area file. If the work area file has changed only by timestamp and not by content, then work area conflict Work Area change to checked-in file, but file contents same is displayed. If the work area file has changed by timestamp as well as by contents, then the conflict Work Area change to checked-in file is displayed. If this option is not specified, then the conflict Work Area change to checked-in file is displayed, even if the work area file differs only by timestamp, but not by content, when compared to the static database file.

Note: Using this option will result in slower performance as considerable extra processing is involved in content matching. This relative slowness can be significant for a large work area involving a large number of files and/or large file sizes. Use this option only if necessary.

-ch|-column_header

Specifies to use a column header in the output format. See -ch|-column_header for details.

-cu|-consider_uncontrolled

Specifies to consider uncontrolled files during reconcile. Any files not under source control are reported as work area conflicts. If neither -cu|-consider_uncontrolled or -if|-ignore_files|-ignore_uncontrolled is specified, the default is to ignore uncontrolled files.

-f|-format format

Specifies the command output format. See -f|-format for details.

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.

file_spec

Specifies the file or directory to be reconciled.

-gby|-groupby groupformat

Specifies how to group the command output. See -gby|-groupby for details.

-if|-ignore_files|-ignore_types file_type,...

Specifies not to reconcile files with file names containing the specified extension. This option works only for uncontrolled files, and must be used with the -cu|-consider_uncontrolled option. Use an option value with a list of one or more file extensions, separated by a comma.

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.

-imwaf|-ignore_missing_wa_file

Specifies to ignore files that are missing from the work area and not report them as work area conflicts. The default is to ignore missing work area files.

-iu|-ignore_uncontrolled

Specifies to ignore uncontrolled files during reconcile. If neither -cu|-consider_uncontrolled or -if|-ignore_files|-ignore_uncontrolled is specified, the default is to ignore uncontrolled files.

-mwaf|-missing_wa_file

Specifies to report missing work area files conflicts. The default is to ignore missing work area files.

-nch|-nocolumn_header

Specifies not to use a column header in the output format. See -nch|-nocolumn_header for details.

-nf|-noformat

Specifies not to use column alignment. See -nf|-noformat for details.

-nr|-no_recurse

Specifies that reconcile does not recurse into the subprojects for a project or the files for a directory or subdirectories when a project or directory is reconciled. The default is not to reconcile recursively.

-ns|-nosort|-no_sort

Specifies not to sort the output. See -ns|-nosort for details.

project_spec

Specifies the project to be reconciled.

-r|-recurse

Specifies to recursively reconcile subprojects, files, and subdirectories for a project. The default is not to reconcile recursively.

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.

-sby|-sortby sortspec

Specifies how to sort the command output. See -sby|-sortby for details.

-sep|-separator separator

Used only with the -f|-format option. Specifies a different separator character. See -sep|-separator for details.

-s|-show

Shows the conflicts without resolving them. The default is to show the work area conflicts.

-udb|-update_db

Updates the database with versions in your work area. Uses of this option include:

If you modify a file that is not checked out, reconcile creates a version by default, and the database is updated with your changes.
If you update the database copy of a file from another work area and change the same file from this work area, the database is updated from the work area.
Use this option when you are certain that the work area represents the correct set of changes.

-uwa|-update_wa: Updates your work area with versions from your database. Use this option when you are certain that the database represents the correct set of changes.

Example

Reconcile the ico_june16-1 project, but do not reconcile files whose file name contains any of these extensions: .doc, .gif, or .exe.
```
ccm reconcile -p ico_june16-1 -ignore_types "*.doc;*.gif   ;*.exe"
```
UNIX: Reconcile the ico_june16-1 project, but discard the updates made in your work area and do not reconcile subprojects belonging to the project.
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%
```

Feedback