blob: 0c372c4c6f76c676d2b106f4736cd122c5209818 [file] [log] [blame]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
<HEAD>
<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
<title>CVS Label Decorations</title>
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1 CLASS="Head">CVS Label Decorations</H1>
<P CLASS="Para"> Label Decorations are used by CVS to show important synchronization
information about workspace resources. Decorations can affect the text or the
icon of the label associated with a resource. The text decorators are configurable
on the <a href="../tasks/tasks-107b.htm">CVS Label Decorations Preference page</a> which can also be used to indicate
which icons are to be enabled. Here is a description of the icons used by CVS.</P>
<table width="94%" border="1">
<tr>
<td align="center"><strong>Decoration</strong></td>
<td><strong>Resource type</strong></td>
<td><strong>Description</strong></td>
</tr>
<tr>
<td width="14%" align="center"><img src="../images/version_controlled.svg" alt="Version control icon" ></td>
<td width="22%">Any</td>
<td width="64%">Indicates that the resource is under version control.</td>
</tr>
<tr>
<td align="center"><img src="../images/dirty_ov.svg" alt="Outgoing icon" ></td>
<td>Any</td>
<td>Indicates that the resource or one of its children contains outgoing changes.</td>
</tr>
<tr>
<td align="center"><img src="../images/edited_ov.svg" alt="Edit local icon" ></td>
<td>File</td>
<td>Indicates that the project containing the file has been configured to
use watch/edit and the file is being edited locally.</td>
</tr>
<tr>
<td align="center"><img src="../images/merged_ov.svg" alt="Merge conflict icon" ></td>
<td>File</td>
<td>Indicates that the file contains a merge conflict which has not yet been
resolved. The conflict is considered resolved once the file is modified
and saved.</td>
</tr>
<tr>
<td align="center"><img src="../images/no_remotedir_ov.svg" alt="No remote folder icon" ></td>
<td>Project or Folder</td>
<td>Indicates that the folder is under version control but does not correspond
to an existing remote directory but is instead most likely a module defined
in the CVSROOT/modules file.</td>
</tr>
<tr>
<td align="center"><img src="../images/question_ov.svg" alt="Not under version control icon" ></td>
<td>File or Folder</td>
<td>Indicates that the resource is not under version control.</td>
</tr>
</table>
<P CLASS="Para"><em>Note</em>: Resources that are ignored by CVS will not be decorated
by any of the above CVS decorations.</P>
<h3 class="related">Related concepts</h3>
<a href="../concepts/cdecorations.htm">Label Decorations</a>
<h3 class="related">Related tasks</h3>
<a href="../tasks/tasks-107b.htm">Enabling the CVS resource decorations</a>
</BODY>
</HTML>