This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-website.git
The following commit(s) were added to refs/heads/asf-site by this push: new 72f36bb Automated site publishing by Jenkins build 395 72f36bb is described below commit 72f36bb416c7ff857f4fcb811eeb23fe1fc21aea Author: jenkins <bui...@apache.org> AuthorDate: Sat Jan 19 11:55:46 2019 +0000 Automated site publishing by Jenkins build 395 --- content/kb/docs/ide/cvs.html | 242 +++++++++++++++++-------------------------- 1 file changed, 93 insertions(+), 149 deletions(-) diff --git a/content/kb/docs/ide/cvs.html b/content/kb/docs/ide/cvs.html index 805f3fc..62fd975 100644 --- a/content/kb/docs/ide/cvs.html +++ b/content/kb/docs/ide/cvs.html @@ -81,32 +81,18 @@ <div id="toc" class="toc"> <div id="toctitle"></div> <ul class="sectlevel1"> -<li><a href="#_synchronizing_local_files_with_a_repository">Synchronizing Local Files with a Repository</a> +<li><a href="#_using_cvs_support_in_netbeans_ide">Using CVS Support in NetBeans IDE</a> <ul class="sectlevel2"> -<li><a href="#_opening_a_cvs_project_in_the_ide">Opening a CVS Project in the IDE</a></li> -<li><a href="#_checking_out_files_from_a_repository">Checking out Files from a Repository</a></li> -<li><a href="#_importing_files_into_a_repository">Importing Files into a Repository</a></li> +<li><a href="#_synchronizing_local_files_with_a_repository">Synchronizing Local Files with a Repository</a></li> +<li><a href="#_editing_sources">Editing Sources</a></li> +<li><a href="#_committing_sources_to_a_repository">Committing Sources to a Repository</a></li> +<li><a href="#_conclusion">Conclusion</a></li> </ul> </li> -<li><a href="#_editing_sources">Editing Sources</a> -<ul class="sectlevel2"> -<li><a href="#_viewing_changes_in_the_source_editor">Viewing Changes in the Source Editor</a></li> -<li><a href="#_viewing_file_status_information">Viewing File Status Information</a></li> -<li><a href="#_comparing_file_revisions">Comparing File Revisions</a></li> -<li><a href="#_merging_file_revisions">Merging File Revisions</a></li> -</ul> -</li> -<li><a href="#_committing_sources_to_a_repository">Committing Sources to a Repository</a> -<ul class="sectlevel2"> -<li><a href="#_updating_local_copies">Updating Local Copies</a></li> -<li><a href="#_resolving_conflicts">Resolving Conflicts</a></li> -<li><a href="#_performing_the_commit">Performing the Commit</a></li> -</ul> -</li> -<li><a href="#_see_also">See Also</a></li> </ul> </div> -<div id="preamble"> +<div class="sect1"> +<h2 id="_using_cvs_support_in_netbeans_ide">Using CVS Support in NetBeans IDE</h2> <div class="sectionbody"> <div class="paragraph"> <p>NetBeans IDE’s CVS support is designed to help streamline the development process for groups working from a shared repository, enabling you to perform versioning tasks directly from your project system within the IDE. The CVS client software comes bundled with NetBeans IDE, and no special setup is necessary in order to begin using CVS.</p> @@ -117,54 +103,8 @@ <div class="paragraph"> <p>CVS, or Concurrent Versions System, is an open-source version control system that keeps track of all work and changes in a set of files. This is typically used during the implementation of a software project, allowing multiple developers to collaborate. For more information about CVS, consult the <a href="http://ximbiot.com/cvs/">official documentation</a>.</p> </div> -<div class="admonitionblock note"> -<table> -<tr> -<td class="icon"> -<i class="fa icon-note" title="Note"></i> -</td> -<td class="content"> -After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plugin from the NetBeans IDE Update Center. Please see the <a href="http://wiki.netbeans.org/CVSSupport">CVS FAQ</a> page for details. -</td> -</tr> -</table> -</div> -<div class="imageblock"> -<div class="content"> -<img src="images/netbeans-stamp-80-74-73.png" alt="netbeans stamp 80 74 73"> -</div> -<div class="title">Figure 1. Content on this page applies to the NetBeans IDE 6.9 and more recent</div> -</div> -<div class="paragraph"> -<p><strong>To complete this tutorial, you need the following software and resources.</strong></p> -</div> -<table class="tableblock frame-all grid-all spread"> -<colgroup> -<col style="width: 50%;"> -<col style="width: 50%;"> -</colgroup> -<thead> -<tr> -<th class="tableblock halign-left valign-top">Software or Resource</th> -<th class="tableblock halign-left valign-top">Version Required</th> -</tr> -</thead> -<tbody> -<tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://netbeans.org/downloads/index.html">NetBeans IDE</a></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">version 6.x and later</p></td> -</tr> -<tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">Java Development Kit (JDK)</a></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">version 6 or later</p></td> -</tr> -</tbody> -</table> -</div> -</div> -<div class="sect1"> -<h2 id="_synchronizing_local_files_with_a_repository">Synchronizing Local Files with a Repository</h2> -<div class="sectionbody"> +<div class="sect2"> +<h3 id="_synchronizing_local_files_with_a_repository">Synchronizing Local Files with a Repository</h3> <div class="paragraph"> <p>When using a version control system, you work by synchronizing local files with a repository, making changes to your local copy, then committing them to the repository. The following list describes various ways you can synchronize a project in NetBeans IDE, depending on your specific situation:</p> </div> @@ -181,14 +121,14 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </li> </ul> </div> -<div class="sect2"> -<h3 id="_opening_a_cvs_project_in_the_ide">Opening a CVS Project in the IDE</h3> +<div class="sect3"> +<h4 id="_opening_a_cvs_project_in_the_ide">Opening a CVS Project in the IDE</h4> <div class="paragraph"> <p>If you already have a CVS versioned project which you have been working with outside of the IDE, you can open it in the IDE and versioning features will automatically become available to you. The IDE scans your open projects and if they contain <code>CVS</code> directories, file status and context-sensitive support automatically becomes active for CVS versioned projects.</p> </div> </div> -<div class="sect2"> -<h3 id="_checking_out_files_from_a_repository">Checking out Files from a Repository</h3> +<div class="sect3"> +<h4 id="_checking_out_files_from_a_repository">Checking out Files from a Repository</h4> <div class="paragraph"> <p>If you want to connect to a remote repository from the IDE, then check out files and immediately begin working with them, do the following:</p> </div> @@ -203,10 +143,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug <p>*Note: *The IDE’s drop-down menus are context-sensitive, i.e., the available options depend on the item currently selected. Therefore, if you are already working within a CVS project, you can choose Versioning > Checkout from the main menu. 2. In the first panel of the wizard, enter the location of the repository as can be defined by <code>CVSROOT</code>:</p> </div> -<div class="literalblock"> -<div class="content"> -<pre>The IDE supports a number of `CVSROOT` formats, depending on whether the CVS repository is local or remote, and what method you are using to connect to it:</pre> -</div> +<div class="paragraph"> +<p>The IDE supports a number of <code>CVSROOT</code> formats, depending on whether the CVS repository is local or remote, and what method you are using to connect to it:</p> </div> <table class="tableblock frame-all grid-all spread"> <colgroup> @@ -249,8 +187,17 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug <div class="paragraph"> <p>Depending on the method you are using you may need to specify other information, such as a password and proxy settings for connecting to a remote repository (e.g. for <code>pserver</code>). Click Next.</p> </div> -<div class="paragraph"> -<p>NOTE:If you are trying to set up public key SSH authentication, see: <a href="http://wiki.netbeans.org/wiki/view/FaqHowToSetUpSSHAuth">How to set up public key SSH authentication?</a>.</p> +<div class="admonitionblock note"> +<table> +<tr> +<td class="icon"> +<i class="fa icon-note" title="Note"></i> +</td> +<td class="content"> +If you are trying to set up public key SSH authentication, see: <a href="http://wiki.netbeans.org/wiki/view/FaqHowToSetUpSSHAuth">How to set up public key SSH authentication?</a>. +</td> +</tr> +</table> </div> <div class="paragraph"> <p>For more help with accessing local repositories, see: <a href="http://wiki.netbeans.org/wiki/view/FaqHowToAccessLocalCVS">How can I access local repositories?</a> @@ -275,12 +222,21 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </li> </ol> </div> -<div class="paragraph"> -<p>*Note: *If the checked out sources contain NetBeans projects, a dialog appears prompting you to open them in the IDE. If the sources do not contain a project, the dialog appears prompting you to create a new project from the sources and then open them in the IDE. If you create a new project for such sources, select the appropriate project category (i.e., in the New Project wizard) and then use the With Existing Sources option within that category.</p> +<div class="admonitionblock note"> +<table> +<tr> +<td class="icon"> +<i class="fa icon-note" title="Note"></i> +</td> +<td class="content"> +If the checked out sources contain NetBeans projects, a dialog appears prompting you to open them in the IDE. If the sources do not contain a project, the dialog appears prompting you to create a new project from the sources and then open them in the IDE. If you create a new project for such sources, select the appropriate project category (i.e., in the New Project wizard) and then use the With Existing Sources option within that category. +</td> +</tr> +</table> </div> </div> -<div class="sect2"> -<h3 id="_importing_files_into_a_repository">Importing Files into a Repository</h3> +<div class="sect3"> +<h4 id="_importing_files_into_a_repository">Importing Files into a Repository</h4> <div class="paragraph"> <p>Alternately, you can import a project you have been working on in the IDE to a remote repository, then continue to work on it in the IDE after it has become versioned with the CVS repository.</p> </div> @@ -322,15 +278,22 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </li> </ol> </div> -<div class="paragraph"> -<p>*Note: *The CVS client does not handle binary file imports by default. The best practice for importing binary sources is to create a <code>cvswrappers</code> file within the repository. See <a href="http://wiki.netbeans.org/FaqCVSHowToImportBinaries">How to Import Binary Files Correctly</a> for more details.</p> -</div> +<div class="admonitionblock note"> +<table> +<tr> +<td class="icon"> +<i class="fa icon-note" title="Note"></i> +</td> +<td class="content"> +The CVS client does not handle binary file imports by default. The best practice for importing binary sources is to create a <code>cvswrappers</code> file within the repository. See <a href="http://wiki.netbeans.org/FaqCVSHowToImportBinaries">How to Import Binary Files Correctly</a> for more details. +</td> +</tr> +</table> </div> </div> </div> -<div class="sect1"> -<h2 id="_editing_sources">Editing Sources</h2> -<div class="sectionbody"> +<div class="sect2"> +<h3 id="_editing_sources">Editing Sources</h3> <div class="paragraph"> <p>Once you have a CVS versioned project opened in the IDE, you can begin making changes to sources. As with any project opened in NetBeans IDE, you can open files in the Source Editor by double-clicking on their nodes, as they appear in the IDE’s windows (e.g. Projects (Ctrl-1), Files (Ctrl-2), Favorites (Ctrl-3) windows).</p> </div> @@ -353,8 +316,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </li> </ul> </div> -<div class="sect2"> -<h3 id="_viewing_changes_in_the_source_editor">Viewing Changes in the Source Editor</h3> +<div class="sect3"> +<h4 id="_viewing_changes_in_the_source_editor">Viewing Changes in the Source Editor</h4> <div class="paragraph"> <p>When you open a versioned file in the IDE’s Source Editor, you can view real-time changes occurring to your file as you modify it against your previously checked-out base version from the repository. As you work, the IDE uses color encoding in the Source Editor’s margins to convey the following information:</p> </div> @@ -407,8 +370,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </tbody> </table> </div> -<div class="sect2"> -<h3 id="_viewing_file_status_information">Viewing File Status Information</h3> +<div class="sect3"> +<h4 id="_viewing_file_status_information">Viewing File Status Information</h4> <div class="paragraph"> <p>When you are working in the Projects (Ctrl-1), Files (Ctrl-2), Favorites (Ctrl-3), or Versioning windows, the IDE provides several visual features that aid in viewing status information about your files. In the example below, notice how the badge (e.g. image::images/blue-badge.png[]), color of the file name, and adjacent status label, all coincide with each other to provide you with a simple but effective way to keep track of versioning information on your files:</p> </div> @@ -433,8 +396,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </li> </ul> </div> -<div class="sect3"> -<h4 id="_badges_and_color_coding">Badges and Color Coding</h4> +<div class="sect4"> +<h5 id="_badges_and_color_coding">Badges and Color Coding</h5> <div class="paragraph"> <p>Badges are applied to project, folder, and package nodes and inform you of the status of files contained within that node:</p> </div> @@ -508,8 +471,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </tbody> </table> </div> -<div class="sect3"> -<h4 id="_file_status_labels">File Status Labels</h4> +<div class="sect4"> +<h5 id="_file_status_labels">File Status Labels</h5> <div class="paragraph"> <p>File status labels provide a textual indication of the status of versioned files in the IDE’s windows. By default, the IDE displays status (new, modified, ignored, etc.) and tag information in gray text to the right of files, as they are listed in windows. You can, however, modify this format to suit your own needs. For example, if you want to add revision numbers to status labels, do the following:</p> </div> @@ -559,8 +522,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug <p>File status labels can be toggled on and off by choosing View > Show Versioning Labels from the main menu.</p> </div> </div> -<div class="sect3"> -<h4 id="_the_versioning_window">The Versioning Window</h4> +<div class="sect4"> +<h5 id="_the_versioning_window">The Versioning Window</h5> <div class="paragraph"> <p>The CVS Versioning window provides you with a real-time list of all of the changes made to files within a selected folder of your local working copy. It opens by default in the bottom panel of the IDE, listing added, deleted or modified files.</p> </div> @@ -666,8 +629,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </table> </div> </div> -<div class="sect2"> -<h3 id="_comparing_file_revisions">Comparing File Revisions</h3> +<div class="sect3"> +<h4 id="_comparing_file_revisions">Comparing File Revisions</h4> <div class="paragraph"> <p>Comparing file revisions is a common task when working with versioned projects. The IDE enables you to compare revisions by using the Diff command, which is available from the right-click menu of a selected item (CVS > Diff), as well as from the Versioning window. In the Versioning window, you can perform diffs by either double-clicking a listed file, otherwise you can click the Diff All icon (image::images/diff.png[]) located in the toolbar at the top.</p> </div> @@ -705,8 +668,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </li> </ul> </div> -<div class="sect3"> -<h4 id="_make_changes_to_your_local_working_copy">Make Changes to your Local Working Copy</h4> +<div class="sect4"> +<h5 id="_make_changes_to_your_local_working_copy">Make Changes to your Local Working Copy</h5> <div class="paragraph"> <p>If you are performing a diff on your local working copy, the IDE enables you to make changes directly from within the Diff Viewer. To do so, you can either place your cursor within the right pane of the Diff Viewer and modify your file accordingly, otherwise make use of the inline icons that display adjacent to each highlighted change:</p> </div> @@ -733,8 +696,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </tbody> </table> </div> -<div class="sect3"> -<h4 id="_navigate_among_differences_between_compared_files">Navigate among Differences between Compared Files</h4> +<div class="sect4"> +<h5 id="_navigate_among_differences_between_compared_files">Navigate among Differences between Compared Files</h5> <div class="paragraph"> <p>If your diff contains multiple differences, you can navigate among them by using the arrow icons displayed in the toolbar. The arrow icons enable you to view differences as they appear from top to bottom:</p> </div> @@ -757,8 +720,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </tbody> </table> </div> -<div class="sect3"> -<h4 id="_change_viewing_criteria">Change Viewing Criteria</h4> +<div class="sect4"> +<h5 id="_change_viewing_criteria">Change Viewing Criteria</h5> <div class="paragraph"> <p>You can choose whether to view files containing changes from the local working copy, the repository, as well as both simultaneously:</p> </div> @@ -786,8 +749,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </table> </div> </div> -<div class="sect2"> -<h3 id="_merging_file_revisions">Merging File Revisions</h3> +<div class="sect3"> +<h4 id="_merging_file_revisions">Merging File Revisions</h4> <div class="paragraph"> <p>NetBeans IDE enables you to merge changes made on different branches of the repository with your local working copy. Using the CVS Merge dialog, you need only specify criteria indicating which repository sources you want merged with your working copy.</p> </div> @@ -825,8 +788,17 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug <div class="paragraph"> <p>Click the Branch button. A new branch is created in the repository, and the IDE switches your target repository location to the new branch. In the Projects window, the new branch name displays in grey text next to versioned files, indicating that you are now working from the branch.</p> </div> -<div class="paragraph"> -<p>*Note: *Make sure your <a href="#fileStatus">file status labels</a> are activated (choose View > Show Versioning Labels from the main menu).</p> +<div class="admonitionblock note"> +<table> +<tr> +<td class="icon"> +<i class="fa icon-note" title="Note"></i> +</td> +<td class="content"> +Make sure your <a href="#fileStatus">file status labels</a> are activated (choose View > Show Versioning Labels from the main menu). +</td> +</tr> +</table> </div> <div class="olist arabic"> <ol class="arabic"> @@ -865,10 +837,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </div> </div> </div> -</div> -<div class="sect1"> -<h2 id="_committing_sources_to_a_repository">Committing Sources to a Repository</h2> -<div class="sectionbody"> +<div class="sect2"> +<h3 id="_committing_sources_to_a_repository">Committing Sources to a Repository</h3> <div class="paragraph"> <p>After making changes to sources, you commit them to the repository. It is generally a good idea to update any copies you have against the repository prior to performing a commit in order to ensure that conflicts do not arise. Conflicts can occur however, and should be thought of as a natural event when numerous developers are working on a project simultaneously. The IDE provides flexible support that enables you to perform all of these functions. It also provides a Conflict Resolver w [...] </div> @@ -885,8 +855,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </li> </ul> </div> -<div class="sect2"> -<h3 id="_updating_local_copies">Updating Local Copies</h3> +<div class="sect3"> +<h4 id="_updating_local_copies">Updating Local Copies</h4> <div class="paragraph"> <p>You can perform updates by choosing CVS > Update from the right-click menu of any versioned item in the Projects, Files, or Favorites windows. When working directly from the Versioning window, you need only right-click a listed file and choose Update.</p> </div> @@ -894,8 +864,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug <p>To perform an update on sources that you have modified, you can click the Update All icon (image::images/update.png[]), which displays in the toolbars located at the top of both the <a href="#versioning">Versioning Window</a>, as well as the <a href="#comparing">Diff Viewer</a>. Any changes that may have occurred in the repository are displayed in the Versioning Output window.</p> </div> </div> -<div class="sect2"> -<h3 id="_resolving_conflicts">Resolving Conflicts</h3> +<div class="sect3"> +<h4 id="_resolving_conflicts">Resolving Conflicts</h4> <div class="paragraph"> <p>When you perform an update or a commit, the IDE’s CVS support compares your files with repository sources to make sure that other changes have not already occurred in the same locations. When your previous checkout (or update) no longer matches the repository <em>HEAD</em> (i.e., most current revision), <em>and</em> the changes that you applied to your local working copy coincide with areas in the HEAD that have also changed, your update or commit results in a <em>conflict</em>.</p> </div> @@ -926,8 +896,8 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug <p>You resolve a conflict by accepting one of the two revisions displayed in the top pane. Click the Accept button of the revision you want to accept. The IDE merges the accepted revision with the source file, and you can immediately see the results of the merge in the bottom pane of the Merge Conflicts Resolver. Once all conflicts are resolved, click OK to exit the Merge Conflicts Resolver and save the modified file. The conflict badge is removed and you can now commit the modified file [...] </div> </div> -<div class="sect2"> -<h3 id="_performing_the_commit">Performing the Commit</h3> +<div class="sect3"> +<h4 id="_performing_the_commit">Performing the Commit</h4> <div class="paragraph"> <p>After editing source files, performing an update and resolving any conflicts, you commit files from your local working copy to the repository. The IDE enables you to call the commit command in the following ways:</p> </div> @@ -994,37 +964,11 @@ After NetBeans IDE 7.0.1, CVS support is available after installing the CVS plug </div> </div> </div> -</div> -<div class="sect1"> -<h2 id="_see_also">See Also</h2> -<div class="sectionbody"> +<div class="sect2"> +<h3 id="_conclusion">Conclusion</h3> <div class="paragraph"> <p>This concludes the Guided Tour of CVS for the NetBeans IDE. This document demonstrated how to perform basic versioning tasks in the IDE by guiding you through the standard workflow when using the IDE’s CVS support. It has shown how to set up a versioned project and perform basic tasks on versioned files while introducing you to some of the new CVS features included in the IDE.</p> </div> -<div class="paragraph"> -<p>For related documents, see the following resources:</p> -</div> -<div class="ulist"> -<ul> -<li> -<p><a href="http://wiki.netbeans.org/NetBeansUserFAQ#CVS">CVS Support FAQ for NetBeans IDE</a>. A document containing frequently asked questions describing setup and usage of CVS in NetBeans IDE.</p> -</li> -<li> -<p><a href="git.html">Using Git Support in NetBeans IDE</a>. An introductory guide to using Git version control client in the NetBeans IDE.</p> -</li> -<li> -<p><a href="mercurial.html">Using Mercurial Support in NetBeans IDE</a>. A guide to using Mercurial version control client in the NetBeans IDE.</p> -</li> -<li> -<p><a href="subversion.html">Using Subversion Support in NetBeans IDE</a>. An introductory guide to using Subversion version control in NetBeans IDE 6.x.</p> -</li> -<li> -<p><a href="clearcase.html">Using ClearCase Support in NetBeans IDE</a>. An introduction to using ClearCase versioning features in the IDE.</p> -</li> -<li> -<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG234">Versioning Applications with Version Control</a> in <em>Developing Applications with NetBeans IDE</em>.</p> -</li> -</ul> </div> </div> </div> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists