1
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
2
"http://www.w3.org/TR/html4/loose.dtd">
4
* Copyright © 2007 Sun Microsystems, Inc. All rights reserved.
5
* Use is subject to license terms.
9
<title>Viewing File Status Information (Subversion)</title>
10
<link href="nbdocs://org.netbeans.modules.usersguide/org/netbeans/modules/usersguide/ide.css"
11
rel="StyleSheet" type="text/css">
15
<h2>Viewing File Status Information (Subversion)</h2>
17
<p><small><a href="#seealso">See Also</a></small></p>
19
<p>The IDE's Subversion support enables you to view and manage the evolution
20
of changes in version-controlled files.</p>
22
<h3>Viewing Revision Information<a name="viewing"></a></h3>
24
<p>The IDE's Subversion support enables you to view version status information in
25
many of the IDE's windows, including the <a href="csh/svn_versioning_window.html">Versioning</a>,
26
Projects, Files, and Favorites windows. The Versioning window, however, represents
27
the primary place within which to manage version-controlled files by displaying a
28
list of all of the new, modified, and removed files in the currently selected project
31
<h4>To open the Versioning window, choose either:</h4>
34
<li>Subversion > Show Changes from the right-click menu of a version-controlled
35
file or folder from the Projects, Files, or Favorites window.</li>
36
<li>Versioning > Show Changes (Versioning > Subversion > Show
37
Changes) from the main menu.</li>
38
<li>Choose Window > Versioning > Subversion from the main menu.</li>
41
<h4>The IDE's Subversion support provides file status information in the following ways:</h4>
44
<li><strong>Status Labels</strong>. Textual indication of file status in the Versioning,
45
Projects, Files, and Favorites windows. To display status labels, choose View
46
> Show Versioning Labels from the main menu.</li>
47
<li><strong>Status Color</strong>. Graphical indication of file status in the Versioning,
48
Projects, Files, and Favorites windows.</li>
49
<li><strong>Status Badges</strong>. Graphical indication of the status of files contained
50
within your project, folder, and package nodes. Displayed in the Projects, Files,
51
and Favorites windows.</li>
52
<li><strong>Revision Annotations</strong>. Displays commit message, author, date, and
53
revision number information in the left margin of files open in the Source Editor.
54
To display annotations, select a versioned file and choose Show Annotations (or
55
Subversion > Show Annotations) from its right-click menu. Alternatively, choose
56
Versioning, > Show Annotations from the main menu.</li>
59
<p>The IDE displays version-controlled files using the following color coding and font styles:</p>
61
<table border="1" cellpadding="5">
64
<th align="center">Description</th>
67
<td><img src="images/green_status.png" alt="green status"></td>
68
<td><strong>Green</strong>. Indicates that the file is a new
69
local file that does not yet exist in the repository.</td>
72
<td><img src="images/blue_status.png" alt="blue status"></td>
73
<td><strong>Blue</strong>. Indicates that the file has been
74
modified locally.</td>
77
<td><img src="images/red_status.png" alt="red status"></td>
78
<td><strong>Red</strong>. Indicates that the file contains conflicts.
79
You must employ the Resolve Conflicts command (Subversion > Resolve
80
Conflicts) for such files.</td>
83
<td><img src="images/grey_status.png" alt="grey status"></td>
84
<td><strong>Grey</strong>. Indicates that the file is ignored by Subversion
85
and will not be included when calling versioning commands. In the
86
<a href="csh/svn_versioning_window.html">Versioning window</a>, grey
87
text signifies deleted files.</td>
90
<td><img src="images/strikethrough_status.png" alt="strike-through status"></td>
91
<td><strong>Strike-through</strong>. Indicates that the file is excluded when
92
calling the Commit command. All other Subversion commands, however, work as
93
usual. Note that files displayed in the strike-through style only appear in
94
the Versioning window and Commit dialog. They will not appear in Diff panes,
95
nor will their parent folders (or packages) display badges if they are modified.</td>
100
<p>Current Subversion file status is indicated by adding the following badges
101
to project, package and directory icons:</p>
103
<table border="1" cellpadding="5">
109
<td><img src="images/blue_badge.png" alt="blue badge"></td>
110
<td><strong>Locally Modified Badge</strong>. A blue badge on a folder or
111
package node marks folders or packages that contain locally modified
112
or new files. In the case of packages, this badge applies only to the
113
package itself and not its subpackages. For folders, the badge indicates
114
local modifications in that folder or any of its subfolders.</td>
117
<td><img src="images/red_badge.png" alt="red badge"></td>
118
<td><strong>Conflict Badge</strong>. A red badge on a folder or package node
119
marks folders or packages that contain files for which the repository
120
copy of the file contains changes which conflict with the local version.
121
In case of packages, this badge applies only to the package itself and not
122
its subpackages. For folders, the badge indicates local modifications in
123
that folder or any of its subfolders.</td>
128
<li>Note that the parent folders (or packages) of files excluded from commits
129
and displayed in the strike-through style will not display badges if they
134
<dt><a name="seealso">See Also</a></dt>
135
<dd><a href="svn_quickref.html">Subversion Tasks: Quick Reference</a></dd>
136
<dd><a href="svn_using.html">Using Subversion in the IDE</a></dd>
140
<small><a href="../credits.html">Legal Notices</a></small>