ide/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs010.htm - netbeans - Git at Google

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--

     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
     regarding copyright ownership.  The ASF licenses this file
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.

 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
 <title>CVS: Diff Viewer</title>
 <link rel="stylesheet" href="ide.css" title="Oracle BLAFDoc" type="text/css"/>
 </head>

 <body>
 <p><a id="org.netbeans.modules.versioning.system.cvss.ui.actions.diff.DiffExecutor$DiffTopComponent" name="org.netbeans.modules.versioning.system.cvss.ui.actions.diff.DiffExecutor$DiffTopComponent"></a></p>
 <div id="NBCSH1677"><!-- infolevel="all" infotype="General" --><a id="sthref209" name="sthref209"></a>
 <h1>CVS: Diff Viewer</h1>
 <a name="BEGIN" id="BEGIN"></a>
 <p>The IDE's graphical Diff Viewer enables you to compare revisions of a file side by side using color coding to emphasize the differences between the files being compared.
 <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
 <param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG2355">
 <param name="text" value="<html><u>How?</u></html>">
 <param name="textFontSize" value="medium">
 <param name="textColor" value="blue">
 </object>
 </p>
 <p>The icons in the Diff Viewer toolbar enable you to perform the following functions:</p>

 <table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
 <col width="24%" />
 <col width="*" />
 <thead>
 <tr align="left" valign="top">
 <th align="left" valign="bottom" id="r1c1-t16">Element</th>
 <th align="left" valign="bottom" id="r1c2-t16">Description</th>
 </tr>
 </thead>
 <tbody>
 <tr align="left" valign="top">
 <td align="left" id="r2c1-t16" headers="r1c1-t16">
 <p>Change viewing criteria</p>
 </td>
 <td align="left" headers="r2c1-t16 r1c2-t16">You can choose whether to view files containing changes from the local working copy, the repository, as well as both simultaneously.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r3c1-t16" headers="r1c1-t16">
 <p>Local</p>
 </td>
 <td align="left" headers="r3c1-t16 r1c2-t16">Displays locally modified files only.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r4c1-t16" headers="r1c1-t16">
 <p>Remote</p>
 </td>
 <td align="left" headers="r4c1-t16 r1c2-t16">Displays remotely modified files only.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r5c1-t16" headers="r1c1-t16">
 <p>Local and Remote</p>
 </td>
 <td align="left" headers="r5c1-t16 r1c2-t16">Local and Remote Displays both locally and remotely modified files.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r6c1-t16" headers="r1c1-t16">
 <p>Navigate among differences found in the compared files</p>
 </td>
 <td align="left" headers="r6c1-t16 r1c2-t16">You can view differences as they appear from top to bottom.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r7c1-t16" headers="r1c1-t16">
 <p>Previous</p>
 </td>
 <td align="left" headers="r7c1-t16 r1c2-t16">Goes to previous difference displayed in the diff.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r8c1-t16" headers="r1c1-t16">
 <p>Next</p>
 </td>
 <td align="left" headers="r8c1-t16 r1c2-t16">Goes to next difference displayed in the diff.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r9c1-t16" headers="r1c1-t16">
 <p>Perform refresh/update on the diff</p>
 </td>
 <td align="left" headers="r9c1-t16 r1c2-t16">You can refresh the status of the diff in the event that changes to your local working directory have been made externally. You can also update the status of repository versions of files shown in the diff.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r10c1-t16" headers="r1c1-t16">
 <p>Refresh</p>
 </td>
 <td align="left" headers="r10c1-t16 r1c2-t16">Refreshes the diff in the event that you have made changes to your local working directory externally.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r11c1-t16" headers="r1c1-t16">
 <p>Update</p>
 </td>
 <td align="left" headers="r11c1-t16 r1c2-t16">Updates the repository version of the file displayed in the diff.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r12c1-t16" headers="r1c1-t16">Commit changes</td>
 <td align="left" headers="r12c1-t16 r1c2-t16">You can commit changes in your local version to the repository.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r13c1-t16" headers="r1c1-t16">
 <p>Commit</p>
 </td>
 <td align="left" headers="r13c1-t16 r1c2-t16">Commits any changes you have made in the local version to the repository.</td>
 </tr>
 </tbody>
 </table>
 <br />
 <!-- -->
 <p>When you choose to open the Diff Viewer on a selected item, all files contained in the item display in the table located above the graphical viewer (In the event that you select a single file, only that file is displayed). The table lists all modified files and organizes information based on the following column headings:</p>

 <table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
 <col width="24%" />
 <col width="*" />
 <thead>
 <tr align="left" valign="top">
 <th align="left" valign="bottom" id="r1c1-t17">Element</th>
 <th align="left" valign="bottom" id="r1c2-t17">Description</th>
 </tr>
 </thead>
 <tbody>
 <tr align="left" valign="top">
 <td align="left" id="r2c1-t17" headers="r1c1-t17">
 <p>File</p>
 </td>
 <td align="left" headers="r2c1-t17 r1c2-t17">The name of the file.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r3c1-t17" headers="r1c1-t17">
 <p>Status</p>
 </td>
 <td align="left" headers="r3c1-t17 r1c2-t17">The status of the file (i.e. modified locally or remotely).</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r4c1-t17" headers="r1c1-t17">
 <p>Location</p>
 </td>
 <td align="left" headers="r4c1-t17 r1c2-t17">The relative path of the file found in the repository.</td>
 </tr>
 </tbody>
 </table>
 <br />
 <!-- -->
 <p>Upon selecting a file from the table, the Diff Viewer displays differences between two versions of a file, select the table row corresponding to the desired file.</p>
 <p>The Diff Viewer highlights changes in the files using the following color encoding.</p>

 <table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
 <col width="24%" />
 <col width="*" />
 <thead>
 <tr align="left" valign="top">
 <th align="left" valign="bottom" id="r1c1-t18">Element</th>
 <th align="left" valign="bottom" id="r1c2-t18">Description</th>
 </tr>
 </thead>
 <tbody>
 <tr align="left" valign="top">
 <td align="left" id="r2c1-t18" headers="r1c1-t18">
 <p>Blue</p>
 </td>
 <td align="left" headers="r2c1-t18 r1c2-t18">Indicates lines that have been changed since the earlier revision</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r3c1-t18" headers="r1c1-t18">
 <p>Green</p>
 </td>
 <td align="left" headers="r3c1-t18 r1c2-t18">Indicates lines that have been added since the earlier revision</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r4c1-t18" headers="r1c1-t18">
 <p>Red</p>
 </td>
 <td align="left" headers="r4c1-t18 r1c2-t18">Indicates lines that have been removed since the earlier revision</td>
 </tr>
 </tbody>
 </table>
 <br />
 <!-- -->
 <p>The following icons enable you to make changes directly within the Diff Viewer:</p>

 <table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
 <col width="24%" />
 <col width="*" />
 <thead>
 <tr align="left" valign="top">
 <th align="left" valign="bottom" id="r1c1-t19">Element</th>
 <th align="left" valign="bottom" id="r1c2-t19">Description</th>
 </tr>
 </thead>
 <tbody>
 <tr align="left" valign="top">
 <td align="left" id="r2c1-t19" headers="r1c1-t19">
 <p>Replace</p>
 </td>
 <td align="left" headers="r2c1-t19 r1c2-t19">Inserts the highlighted text from the previous revision into the current revision</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r3c1-t19" headers="r1c1-t19">
 <p>Move All</p>
 </td>
 <td align="left" headers="r3c1-t19 r1c2-t19">Reverts the file's current version to the state of the selected previous version.</td>
 </tr>
 <tr align="left" valign="top">
 <td align="left" id="r4c1-t19" headers="r1c1-t19">
 <p>Remove</p>
 </td>
 <td align="left" headers="r4c1-t19 r1c2-t19">Removes the highlighted text from the current version so that it mirrors the previous version.</td>
 </tr>
 </tbody>
 </table>
 <br />
 <!-- -->
 <a id="NBCSH1698" name="NBCSH1698"></a>
 <hr><p><b>Related Topics</b></p>
 <p><i>Developing Applications with NetBeans IDE</i>,
 <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
 <param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG236">
 <param name="text" value="<html><u>&quot;Versioning Applications with CVS&quot;</u></html>">
 <param name="textFontSize" value="medium">
 <param name="textColor" value="blue">
 </object>
 </p>

 <!-- -->
 <!-- Start Footer -->


 <table summary="" cellspacing="0" cellpadding="0" width="100%">
 <tr>
 <td align="left" width="86%"><a href="legal_notice.htm">
 Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a>
 </td>
 </tr>
 </table>
 <!-- -->
 </body>
 </html>
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<!--

	Licensed to the Apache Software Foundation (ASF) under one
	or more contributor license agreements. See the NOTICE file
	distributed with this work for additional information
	regarding copyright ownership. The ASF licenses this file
	to you under the Apache License, Version 2.0 (the
	"License"); you may not use this file except in compliance
	with the License. You may obtain a copy of the License at

	http://www.apache.org/licenses/LICENSE-2.0

	Unless required by applicable law or agreed to in writing,
	software distributed under the License is distributed on an
	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
	KIND, either express or implied. See the License for the
	specific language governing permissions and limitations
	under the License.

	-->
	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
	<head>
	<title>CVS: Diff Viewer</title>
	<link rel="stylesheet" href="ide.css" title="Oracle BLAFDoc" type="text/css"/>
	</head>

	<body>
	<p><a id="org.netbeans.modules.versioning.system.cvss.ui.actions.diff.DiffExecutor$DiffTopComponent" name="org.netbeans.modules.versioning.system.cvss.ui.actions.diff.DiffExecutor$DiffTopComponent"></a></p>
	<div id="NBCSH1677"><!-- infolevel="all" infotype="General" --><a id="sthref209" name="sthref209"></a>
	<h1>CVS: Diff Viewer</h1>
	<a name="BEGIN" id="BEGIN"></a>
	<p>The IDE's graphical Diff Viewer enables you to compare revisions of a file side by side using color coding to emphasize the differences between the files being compared.
	<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
	<param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG2355">
	<param name="text" value="<html><u>How?</u></html>">
	<param name="textFontSize" value="medium">
	<param name="textColor" value="blue">
	</object>
	</p>
	<p>The icons in the Diff Viewer toolbar enable you to perform the following functions:</p>

	<table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
	<col width="24%" />
	<col width="*" />
	<thead>
	<tr align="left" valign="top">
	<th align="left" valign="bottom" id="r1c1-t16">Element</th>
	<th align="left" valign="bottom" id="r1c2-t16">Description</th>
	</tr>
	</thead>
	<tbody>
	<tr align="left" valign="top">
	<td align="left" id="r2c1-t16" headers="r1c1-t16">
	<p>Change viewing criteria</p>
	</td>
	<td align="left" headers="r2c1-t16 r1c2-t16">You can choose whether to view files containing changes from the local working copy, the repository, as well as both simultaneously.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r3c1-t16" headers="r1c1-t16">
	<p>Local</p>
	</td>
	<td align="left" headers="r3c1-t16 r1c2-t16">Displays locally modified files only.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r4c1-t16" headers="r1c1-t16">
	<p>Remote</p>
	</td>
	<td align="left" headers="r4c1-t16 r1c2-t16">Displays remotely modified files only.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r5c1-t16" headers="r1c1-t16">
	<p>Local and Remote</p>
	</td>
	<td align="left" headers="r5c1-t16 r1c2-t16">Local and Remote Displays both locally and remotely modified files.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r6c1-t16" headers="r1c1-t16">
	<p>Navigate among differences found in the compared files</p>
	</td>
	<td align="left" headers="r6c1-t16 r1c2-t16">You can view differences as they appear from top to bottom.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r7c1-t16" headers="r1c1-t16">
	<p>Previous</p>
	</td>
	<td align="left" headers="r7c1-t16 r1c2-t16">Goes to previous difference displayed in the diff.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r8c1-t16" headers="r1c1-t16">
	<p>Next</p>
	</td>
	<td align="left" headers="r8c1-t16 r1c2-t16">Goes to next difference displayed in the diff.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r9c1-t16" headers="r1c1-t16">
	<p>Perform refresh/update on the diff</p>
	</td>
	<td align="left" headers="r9c1-t16 r1c2-t16">You can refresh the status of the diff in the event that changes to your local working directory have been made externally. You can also update the status of repository versions of files shown in the diff.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r10c1-t16" headers="r1c1-t16">
	<p>Refresh</p>
	</td>
	<td align="left" headers="r10c1-t16 r1c2-t16">Refreshes the diff in the event that you have made changes to your local working directory externally.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r11c1-t16" headers="r1c1-t16">
	<p>Update</p>
	</td>
	<td align="left" headers="r11c1-t16 r1c2-t16">Updates the repository version of the file displayed in the diff.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r12c1-t16" headers="r1c1-t16">Commit changes</td>
	<td align="left" headers="r12c1-t16 r1c2-t16">You can commit changes in your local version to the repository.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r13c1-t16" headers="r1c1-t16">
	<p>Commit</p>
	</td>
	<td align="left" headers="r13c1-t16 r1c2-t16">Commits any changes you have made in the local version to the repository.</td>
	</tr>
	</tbody>
	</table>
	<br />
	<!-- -->
	<p>When you choose to open the Diff Viewer on a selected item, all files contained in the item display in the table located above the graphical viewer (In the event that you select a single file, only that file is displayed). The table lists all modified files and organizes information based on the following column headings:</p>

	<table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
	<col width="24%" />
	<col width="*" />
	<thead>
	<tr align="left" valign="top">
	<th align="left" valign="bottom" id="r1c1-t17">Element</th>
	<th align="left" valign="bottom" id="r1c2-t17">Description</th>
	</tr>
	</thead>
	<tbody>
	<tr align="left" valign="top">
	<td align="left" id="r2c1-t17" headers="r1c1-t17">
	<p>File</p>
	</td>
	<td align="left" headers="r2c1-t17 r1c2-t17">The name of the file.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r3c1-t17" headers="r1c1-t17">
	<p>Status</p>
	</td>
	<td align="left" headers="r3c1-t17 r1c2-t17">The status of the file (i.e. modified locally or remotely).</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r4c1-t17" headers="r1c1-t17">
	<p>Location</p>
	</td>
	<td align="left" headers="r4c1-t17 r1c2-t17">The relative path of the file found in the repository.</td>
	</tr>
	</tbody>
	</table>
	<br />
	<!-- -->
	<p>Upon selecting a file from the table, the Diff Viewer displays differences between two versions of a file, select the table row corresponding to the desired file.</p>
	<p>The Diff Viewer highlights changes in the files using the following color encoding.</p>

	<table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
	<col width="24%" />
	<col width="*" />
	<thead>
	<tr align="left" valign="top">
	<th align="left" valign="bottom" id="r1c1-t18">Element</th>
	<th align="left" valign="bottom" id="r1c2-t18">Description</th>
	</tr>
	</thead>
	<tbody>
	<tr align="left" valign="top">
	<td align="left" id="r2c1-t18" headers="r1c1-t18">
	<p>Blue</p>
	</td>
	<td align="left" headers="r2c1-t18 r1c2-t18">Indicates lines that have been changed since the earlier revision</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r3c1-t18" headers="r1c1-t18">
	<p>Green</p>
	</td>
	<td align="left" headers="r3c1-t18 r1c2-t18">Indicates lines that have been added since the earlier revision</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r4c1-t18" headers="r1c1-t18">
	<p>Red</p>
	</td>
	<td align="left" headers="r4c1-t18 r1c2-t18">Indicates lines that have been removed since the earlier revision</td>
	</tr>
	</tbody>
	</table>
	<br />
	<!-- -->
	<p>The following icons enable you to make changes directly within the Diff Viewer:</p>

	<table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0">
	<col width="24%" />
	<col width="*" />
	<thead>
	<tr align="left" valign="top">
	<th align="left" valign="bottom" id="r1c1-t19">Element</th>
	<th align="left" valign="bottom" id="r1c2-t19">Description</th>
	</tr>
	</thead>
	<tbody>
	<tr align="left" valign="top">
	<td align="left" id="r2c1-t19" headers="r1c1-t19">
	<p>Replace</p>
	</td>
	<td align="left" headers="r2c1-t19 r1c2-t19">Inserts the highlighted text from the previous revision into the current revision</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r3c1-t19" headers="r1c1-t19">
	<p>Move All</p>
	</td>
	<td align="left" headers="r3c1-t19 r1c2-t19">Reverts the file's current version to the state of the selected previous version.</td>
	</tr>
	<tr align="left" valign="top">
	<td align="left" id="r4c1-t19" headers="r1c1-t19">
	<p>Remove</p>
	</td>
	<td align="left" headers="r4c1-t19 r1c2-t19">Removes the highlighted text from the current version so that it mirrors the previous version.</td>
	</tr>
	</tbody>
	</table>
	<br />
	<!-- -->
	<a id="NBCSH1698" name="NBCSH1698"></a>
	<hr><p><b>Related Topics</b></p>
	<p><i>Developing Applications with NetBeans IDE</i>,
	<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
	<param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG236">
	<param name="text" value="<html><u>"Versioning Applications with CVS"</u></html>">
	<param name="textFontSize" value="medium">
	<param name="textColor" value="blue">
	</object>
	</p>

	<!-- -->
	<!-- Start Footer -->


	<table summary="" cellspacing="0" cellpadding="0" width="100%">
	<tr>
	<td align="left" width="86%"><a href="legal_notice.htm">
	Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a>
	</td>
	</tr>
	</table>
	<!-- -->
	</body>
	</html>