head	1.5;
access;
symbols
	TIGRIS_1_1_0RC2:1.2
	TIGRIS_1_1_0RC1:1.2
	TIGRIS_1_1:1.2.0.4
	TIGRIS_1_0_8:1.2
	TIGRIS_1_0_8RC3:1.2
	TIGRIS_1_0_8RC2:1.2
	TIGRIS_1_0_8RC1:1.2
	TIGRIS_1_0_7:1.2
	TIGRIS_1_0_7RC3:1.2
	TIGRIS_1_0_7RC2:1.2
	TIGRIS_1_0_7RC1:1.2
	TIGRIS_1_0_6:1.2
	TIGRIS_1_0_6RC5:1.2
	TIGRIS_1_0_6RC4:1.2
	TIGRIS_1_0_6RC3:1.2
	TIGRIS_1_0_6RC2:1.2
	TIGRIS_1_0_6RC1:1.2
	TIGRIS_1_0_5:1.2
	TIGRIS_1_0_5RC6:1.2
	TIGRIS_1_0_5RC5:1.2
	TIGRIS_1_0_5RC4:1.2
	TIGRIS_1_0_5RC3:1.2
	TIGRIS_1_0_5RC2:1.2
	TIGRIS_1_0_5RC1:1.2
	TIGRIS_1_0_4:1.2
	TIGRIS_1_0_3:1.2
	TIGRIS_1_0_2:1.2
	TIGRIS_1_0_1:1.2
	TIGRIS_1_0:1.2.0.6
	TIGRIS_1_0_0:1.2
	TIGRIS_1_0_0_RC1:1.2.0.2;
locks; strict;
comment	@# @;


1.5
date	2001.07.11.22.37.03;	author csjank;	state Exp;
branches;
next	1.4;

1.4
date	2001.06.21.07.07.40;	author jefflove;	state Exp;
branches;
next	1.3;

1.3
date	2001.06.11.03.14.33;	author jefflove;	state Exp;
branches;
next	1.2;

1.2
date	2001.03.15.07.35.48;	author lori;	state Exp;
branches;
next	1.1;

1.1
date	2001.03.09.22.42.43;	author csjank;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Removed outdated screen shots and updated information to match new version of WinCVS.
@
text
@  <div class="docs" id="ddusingwincvs01">
   <h2>Checking files in and out of WinCvs</h2>

   <div class="toc">
    <h3>Help for WinCvs: Index</h3>

    <ul>
     <li><a href="ddUsingWinCvs.html">Setting up WinCvs</a></li>

     <li>
      <strong>You are here:</strong> Checking source files in and out of WinCvs 

      <ul>
       <li><a href="#checkingout">Checking out source files</a></li>

       <li><a href="#cvsadd">Adding/committing files</a></li>

       <li><a href="#cvsupdate">Updating/merging files</a></li>
      </ul>
     </li>

     <li><a href="ddUsingWinCvs-02.html">Managing files in WinCvs</a></li>
    </ul>
   </div>

   
  <h3><a id="checkingout" name="checkingout">Checking out Source Files</a></h3>

   <p>Before you can make changes to source files, you must <i>check out</i> (make a copy on your local hard disk) the project or "module" files you want. A module is a subset of the entire project file repository.</p>

   
  <p>Log in to the project's CVS server and provide your password. Then select 
    <strong>Checkout module...</strong> from the <strong>Create</strong> menu 
    to retrieve the latest versions of files. You will need to define the module 
    you wish to check out and the directory where you want the checked out files 
    to reside on you local drive.</p>

   
  <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646179">More about 
    logging in to the project server</a><br />
    <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646180">More about 
    checking out source files</a></p>
  <div class="courtesylinks">
    <div class="courtesylinks"></div>
    <h3><a id="cvsupdate" name="cvsupdate">Updating/Merging Files</a></h3>
    <p>You should always update your working copy of the project repository before 
      you commit your changes. This ensures that you are making changes to the 
      most recent versions of files. Updating will not overwrite your modifications 
      if another developer has made changes to the same file(s). Instead, WinCvs 
      attempts to merge the two versions.</p>
    <p>To update, select the file(s) or folder(s) you wish to update and select 
      <strong>Update files...</strong> on the <strong>Modify</strong> menu.</p>
    <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646181">More 
      about updating</a><br />
      <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646192">More 
      about merging</a></p>
    <div class="courtesylinks"></div>
    <p>For information on file statuses and comparing files, see <a href="ddUsingWinCvs-02.html">Managing 
      files in WinCvs</a>.</p>

   </div>

   
  <h3><a id="cvsadd" name="cvsadd">Adding/Committing Files</a></h3>

   <p>WinCvs is not a file editor. You can use the file editor of choice on your local machine to modify project files you have checked out. When you have completed your changes to files on your hard drive, you can <i>commit</i> those changes back into the project's CVS repository.</p>

   
  <p>Whenever you <i>create</i> a new file on your hard disk and you want to add 
    that file to the project, an "unknown file" icon <img alt="" src="images/wincvs_unknown_icon.gif" height="15" width="13" /> 
    will appear next to your new files.</p>

   <p>Select the new file and click the "Add Selected" <img alt="" src="images/wincvs_addselected.gif" height="15" width="13" /> or "Add Selected Binary" <img alt="" src="images/wincvs_addbinary.gif" height="15" width="13" /> button in the toolbar to mark the file as under version control.</p>

   <ul>
    <li>Use "<strong>Add Selected</strong> " for text files (e.g., *.txt or *.html).</li>

    <li>Use "<strong>Add Selected Binary</strong>" for files that have non-text formats (e.g., application data files or graphics).</li>
   </ul>

   
  <p><strong>Note:</strong> Adding the file <i>does not</i> put it into the project's 
    CVS repository. You must then commit it.</p>

   <p>Files that still need to be committed display a red icon <img alt="" src="images/wincvs_modified_icon.gif" height="15" width="13" /> next to them. To commit these files:</p>

   <ol>
    <li>Select the entire directory in the left-hand pane, or select only those individual files to be committed.</li>

    <li>Click the commit icon <img alt="" src="images/wincvs_commit_icon.gif" height="25" width="23" /> in the tool bar. You are prompted for a log message.</li>

    <li>Enter a brief description of the changes made to each file.</li>
   </ol>

   
  <p>The results of the committing a file are displayed in the lower pane. If 
    problems or <i>conflicts</i> are encountered during the merge, WinCvs aborts 
    the commit process. You must then open the file in your file editor, resolve 
    the conflicts, save it again, and then commit. <!--For more about resolving conflicts, see [LINK].--></p>

   
  <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646186">More about 
    adding files</a><br />
    <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646185">More about 
    committing files</a></p>
  <div class="courtesylinks"></div>

   <div class="courtesylinks">
    <p><a href="/servlets/HelpTOC">Back to main Help index</a></p>
   </div>
  </div>
 


@


1.4
log
@html usage revision
@
text
@d26 2
a27 1
   <h3><a id="checkingout" name="checkingout">Checking out source files</a></h3>
d31 29
a59 1
   <p>Log in to the project's CVS server and provide your password. Then select <strong>Checkout module...</strong> from the <strong>Create</strong> menu to retrieve the latest versions of files. The default selection is <strong><em>all</em></strong> file, or you can select a specific module to check out.</p>
a60 9
   <p><img alt="" src="images/wincvs_checkout.gif" height="494" width="440" /></p>

   <p>You can use the left-hand navigation pane to see the directories and files in that module:</p>

   <p><img alt="" src="images/wincvs_dir.gif" height="576" width="641" /></p>

   <div class="courtesylinks">
    <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646179">More about logging in to the project server</a><br />
     <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646180">More about checking out source files</a></p>
d63 2
a64 1
   <h3><a id="cvsadd" name="cvsadd">Adding/committing files</a></h3>
d68 4
a71 5
   <p>The following example shows the WinCvs window after committing some changes in a directory containing html content files.</p>

   <p><img alt="" src="images/wincvs_afterchange.gif" height="396" width="441" /></p>

   <p>Whenever you <i>create</i> a new file on your hard disk and you want to add that file to the project, an "unknown file" icon <img alt="" src="images/wincvs_unknown_icon.gif" height="15" width="13" /> will appear next to your new files.</p>
d76 1
a76 1
    <li>Use "<strong>Add Selected</strong> " for files that are basically text files (e.g., *.txt or *.html).</li>
d81 3
a83 3
   <p><strong>Note:</strong></p>

   <p>Marking the file as "added" <i>does not</i> put it into the project's CVS repository! You must then commit it.</p>
d95 12
a106 23
   <p>The results of the committing a file are displayed in the lower right-hand pane. If problems or <i>conflicts</i> are encountered during the merge, WinCvs aborts the commit process. You must then open the file in your file editor, resolve the conflicts, save it again, and then commit. <!--For more about resolving conflicts, see [LINK].--></p>

   <p><img alt="" src="images/wincvs_commit.gif" height="396" width="441" /></p>

   <div class="courtesylinks">
    <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646186">More about adding files</a><br />
     <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646185">More about committing files</a></p>
   </div>

   <h3><a id="cvsupdate" name="cvsupdate">Updating/merging files</a></h3>

   <p>You should always update your working copy of the project repository before you commit your changes. This ensures that you are making changes to the most recent versions of files. Updating will not overwrite your modifications if another developer has made changes to the same file(s). Instead, WinCvs attempts to merge the two versions.</p>

   <p>To update, select <strong>Update files...</strong> on the <strong>CVS Files</strong> menu and select the file(s) or folder(s) you wish to update.</p>

   <p><img alt="" src="images/wincvs_update.gif" height="396" width="441" /></p>

   <div class="courtesylinks">
    <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646181">More about updating</a><br />
     <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646192">More about merging</a></p>
   </div>

   <p>For information on file statuses and comparing files, see <a href="ddUsingWinCvs-02.html">Managing files in WinCvs</a>.</p>
@


1.3
log
@extensive markup rework - first pass toward house xhtmlification
@
text
@d1 2
a2 16
<!DOCTYPE html PUBLIC "-//CollabNet//DTD XHTML 1.0 Transitional//EN"
"http://collabnet.com/dtds/collabnet_transitional_10.dtd">
<html>
 <head>
  <title>Using WinCVS</title>
<style type="text/css">
 dt.c1 {font-weight: bold}
</style>
<style type="text/css">
 p.c1 {font-weight: bold}
</style>
 </head>

 <body>
  <div class="docs" id="docid">
<h2>Checking files in and out of WinCvs</h2>
d4 2
d7 2
a8 1
  <p>Help for WinCvs: Index</p>
d10 2
a11 2
  <dl>
   <dt><a href="ddUsingWinCvs.html">Setting up WinCvs</a></dt>
d13 2
a14 1
   <dt>You are here: Checking source files in and out of WinCvs</dt>
d16 1
a16 3
   <dd>
    <ul>
     <li><b><a href="#checkingout">Checking out source files</a></b></li>
d18 3
a20 1
     <li><b><a href="#cvsadd">Adding/committing files</a></b></li>
d22 1
a22 1
     <li><b><a href="#cvsupdate">Updating/merging files</a></b></li>
d24 3
a26 1
   </dd>
d28 1
a28 2
   <dt><a href="ddUsingWinCvs-02.html">Managing files in WinCvs</a></dt>
  </dl>
d30 1
a30 1
  <h3><a id="checkingout" name="checkingout">Checking out source files</a></h3>
d32 1
a32 1
  <p>Before you can make changes to source files, you must <i>check out</i> (make a copy on your local hard disk) the project or "module" files you want. A module is a subset of the entire project file repository.</p>
d34 1
a34 5
  <p>Log in to the project's CVS server and provide your password. Then select <strong>Checkout module...</strong> from the <strong>Create</strong> menu to retrieve the latest versions of files. The default selection is <strong><em>all</em></strong> file, or you can select a specific module to check out.</p>
  <p>
<img alt="" src="images/wincvs_checkout.gif" height="494" width="440" />
</p>
 
d36 1
a36 1
  <p>You can use the left-hand navigation pane to see the directories and files in that module:</p>
d38 4
a41 1
  <p><img alt="" src="images/wincvs_dir.gif" height="576" width="641" /></p>
d43 1
a43 2
  <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646179">More about logging in to the project server</a><br />
   <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646180">More about checking out source files</a></p>
d45 1
a45 1
  <h3><a id="cvsadd" name="cvsadd">Adding/committing files</a></h3>
d47 1
a47 1
  <p>WinCvs is not a file editor. You can use the file editor of choice on your local machine to modify project files you have checked out. When you have completed your changes to files on your hard drive, you can <i>commit</i> those changes back into the project's CVS repository.</p>
d49 1
a49 1
  <p>The following example shows the WinCvs window after committing some changes in a directory containing html content files.</p>
d51 1
a51 1
  <p><img alt="" src="images/wincvs_afterchange.gif" height="396" width="441" /></p>
d53 1
a53 1
  <p>Whenever you <i>create</i> a new file on your hard disk and you want to add that file to the project, an "unknown file" icon <img alt="" src="images/wincvs_unknown_icon.gif" height="15" width="13" /> will appear next to your new files.</p>
d55 2
a56 1
  <p>Select the new file and click the "Add Selected" <img alt="" src="images/wincvs_addselected.gif" height="15" width="13" /> or "Add Selected Binary" <img alt="" src="images/wincvs_addbinary.gif" height="15" width="13" /> button in the toolbar to mark the file as under version control.</p>
d58 2
a59 5
  <blockquote>
 <p>
  Use "<strong>Add Selected</strong> " for files that are basically text files (e.g., *.txt or *.html).<br />
    Use "<strong>Add Selected Binary</strong>" for files that have non-text formats (e.g., application data files or graphics).
</p>
d61 1
a61 4
  </blockquote>
 <p>
 <strong>Note:</strong> 
</p>
d63 1
d65 1
a65 1
  <p>Marking the file as "added" <i>does not</i> put it into the project's CVS repository! You must then commit it.</p>
d67 2
a68 1
  <p>Files that still need to be committed display a red icon <img alt="" src="images/wincvs_modified_icon.gif" height="15" width="13" /> next to them. To commit these files:</p>
d70 1
a70 2
  <ol>
   <li>Select the entire directory in the left-hand pane, or select only those individual files to be committed.</li>
d72 2
a73 1
   <li>Click the commit icon <img alt="" src="images/wincvs_commit_icon.gif" height="25" width="23" /> in the tool bar. You are prompted for a log message.</li>
d75 1
a75 2
   <li>Enter a brief description of the changes made to each file.</li>
  </ol>
d77 1
a77 1
  <p>The results of the committing a file are displayed in the lower right-hand pane. If problems or <i>conflicts</i> are encountered during the merge, WinCvs aborts the commit process. You must then open the file in your file editor, resolve the conflicts, save it again, and then commit. <!--For more about resolving conflicts, see [LINK].--></p>
d79 4
a82 1
  <p><img alt="" src="images/wincvs_commit.gif" height="396" width="441" /></p>
d84 1
a84 2
  <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646186">More about adding files</a><br />
   <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646185">More about committing files</a></p>
d86 1
a86 1
  <h3><a id="cvsupdate" name="cvsupdate">Updating/merging files</a></h3>
d88 1
a88 1
  <p>You should always update your working copy of the project repository before you commit your changes. This ensures that you are making changes to the most recent versions of files. Updating will not overwrite your modifications if another developer has made changes to the same file(s). Instead, WinCvs attempts to merge the two versions.</p>
d90 1
a90 1
  <p>To update, select <strong>Update files...</strong> on the <strong>CVS Files</strong> menu and select the file(s) or folder(s) you wish to update.</p>
d92 4
a95 1
  <p><img alt="" src="images/wincvs_update.gif" height="396" width="441" /></p>
d97 1
a97 2
  <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646181">More about updating</a><br />
   <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646192">More about merging</a></p>
d99 5
a103 5
  <p>For information on file statuses and comparing files, see <a href="ddUsingWinCvs-02.html">Managing files in WinCvs</a>.</p>
<div class="courtesylinks"><a href="/servlets/HelpTOC">Back to main Help index</a></div>
 </div>
</body>
</html>
@


1.2
log
@second of three-part doc; html tag edits
@
text
@d1 2
d4 9
a12 1
<head>
d14 3
a16 1
<title>Using WinCVS</title>
a17 2
</head>
<body>
d19 1
d21 2
a22 103
<p>
    <p><span class="Header" nowrap>Checking files in and out of 
    WinCvs</span>
<p>
<span class="PlainText">  
      <p> <b>Help for WinCvs: Index</b></p>



      <dl> 
        <dt><a href="ddUsingWinCvs.html">Setting up WinCvs</a> 
        <dt><b>You are here: Checking source files in and out of WinCvs
          <ul>
              <li><a href="#checkingout">Checking out source files</a>
			  <li><a href="#cvsadd">Adding/committing files</a> 
			  <li><a href="#cvsupdate">Updating/merging files</a>	
          </ul></b>
        <dt><a href="ddUsingWinCvs-02.html">Managing files in WinCvs</a></dt>
      </dl>

<hr noshade size=1>
      <a name="checkingout"></a><span class="InputHeader">Checking out source 
      files</span> <span class="PlainText"> 
      <p>Before you can make changes to source files, you must <i>check out</i> 
        (make a copy on your local hard disk) the project or "module" files you 
        want. A module is a subset of the entire project file repository.</p>
      <p>Log in to the project's CVS server and provide your password. Then select 
        <strong>Checkout module...</strong> from the <strong>Create</strong> menu 
        to retrieve the latest versions of files. The default selection is <strong><em>all</em></strong> 
        file, or you can select a specific module to check out.</p>
      <img src="images/wincvs_checkout.gif"> 
      <p>You can use the left-hand navigation pane to see the directories and 
        files in that module:</p>
      <p><img src="images/wincvs_dir.gif"></p>
      <p> <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646179" target="_new">More 
        about logging in to the project server</a><br>
        <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646180" target="_new">More 
        about checking out source files</a> 
      <p> 
      <hr noshade size=1>
      <a name="cvsadd"></a><span class="InputHeader">Adding/committing files</span> 
      <p>WinCvs is not a file editor. You can use the file editor of choice on 
        your local machine to modify project files you have checked out. When 
        you have completed your changes to files on your hard drive, you can <i>commit</i> 
        those changes back into the project's CVS repository.</p>
      <p>The following example shows the WinCvs window after committing some changes 
        in a directory containing html content files.</p>
      <p><img src="images/wincvs_afterchange.gif"></p>
      <p>Whenever you <i>create</i> a new file on your hard disk and you want 
        to add that file to the project, an "unknown file" icon <img src="images/wincvs_unknown_icon.gif"> 
        will appear next to your new files.</p>
      <p>Select the new file and click the "Add Selected" <img src="images/wincvs_addselected.gif"> 
        or "Add Selected Binary" <img src="images/wincvs_addbinary.gif"> button 
        in the toolbar to mark the file as under version control. <br>
      <blockquote>Use "<strong>Add Selected</strong> " for files that are basically 
        text files (e.g., *.txt or *.html).<br>
        Use "<strong>Add Selected Binary</strong>" for files that have non-text 
        formats (e.g., application data files or graphics).</blockquote>
      <strong>Note:</strong> Marking the file as "added" <i>does not</i> put it 
      into the project's CVS repository! You must then commit it. 
      <p></p>
      <p>Files that still need to be committed display a red icon <img src="images/wincvs_modified_icon.gif"> 
        next to them. To commit these files:</p>
      <ol>
        <li>Select the entire directory in the left-hand pane, or select only 
          those individual files to be committed. 
        <li>Click the commit icon <img src="images/wincvs_commit_icon.gif"> in 
          the tool bar. You are prompted for a log message. 
        <li>Enter a brief description of the changes made to each file.</li>
      </ol>
      <p>The results of the committing a file are displayed in the lower right-hand 
        pane. If problems or <i>conflicts</i> are encountered during the merge, 
        WinCvs aborts the commit process. You must then open the file in your 
        file editor, resolve the conflicts, save it again, and then commit. <!--For more about resolving conflicts, see [LINK].--> 
      <p><img src="images/wincvs_commit.gif"></p>
      <p> <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646186" target="_new">More 
        about adding files</a><br>
        <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646185" target="_new">More 
        about committing files</a> 
      <p> 
      <hr noshade size=1>
      <a name="cvsupdate"></a><span class="InputHeader">Updating/merging files</span> 
      <p>You should always update your working copy of the project repository 
        before you commit your changes. This ensures that you are making changes 
        to the most recent versions of files. Updating will not overwrite your 
        modifications if another developer has made changes to the same file(s). 
        Instead, WinCvs attempts to merge the two versions. 
      <p>To update, select <strong>Update files...</strong> on the <strong>CVS 
        Files</strong> menu and select the file(s) or folder(s) you wish to update. 
      <p><img src="images/wincvs_update.gif"></p>
      <p> <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646181" target="_new">More 
        about updating</a><br>
        <a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646192" target="_new">More 
        about merging</a> 
      </span>
      <p>For information on file statuses and comparing files, see <a href="ddUsingWinCvs-02.html">Managing 
        files in WinCvs</a>. </p>
      <span class="PlainText">
<hr noshade size=1>
      <a href="/servlets/HelpTOC">Back to main Help index</a> 
      <p></p>
      </span> 
    <p></p>
d24 89
a112 1
</span>
d115 2
@


1.1
log
@broke WinCvs help file into three files to make load go faster.
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d1 2
a2 2
<HTML>
<HEAD>
d4 1
a4 1
<TITLE>Using WinCVS</TITLE>
d6 2
a7 2
</HEAD>
<BODY>
d9 3
a11 4
<TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2" width="100%" >
  <TR>
<P>
    <P><span class="Header" nowrap>Checking files in and out of 
d13 5
a17 1
	</TR></TABLE>
d19 3
a21 10
<TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2" width="100%" >
  <TR>
   <TD class="PlainText">
      <P> <span class="InputHeader">Help for WinCvs: Index</span></p>

  

      <dL> 
        <dt><A href="ddUsingWinCvs.html">Setting up WinCvs</A> 
        <dt>You are here: Checking source files in and out of WinCvs 
d25 3
a27 3
			  <li><A href="#cvsupdate">Updating/merging files</A>	
          </ul>
        <dt><A href="ddUsingWinCvs-02.html">Managing files in WinCvs</A></dt>
d30 1
a30 1
<HR noShade SIZE=1>
d33 1
a33 1
      <P>Before you can make changes to source files, you must <I>check out</I> 
d35 5
a39 5
        want. A module is a subset of the entire project file repository.</P>
      <P>Log in to the project's CVS server and provide your password. Then select 
        <STRONG>Checkout module...</STRONG> from the <STRONG>Create</STRONG> menu 
        to retrieve the latest versions of files. The default selection is <STRONG><EM>all</EM></STRONG> 
        file, or you can select a specific module to check out.</P>
d41 11
a51 11
      <P>You can use the left-hand navigation pane to see the directories and 
        files in that module:</P>
      <P><IMG src="images/wincvs_dir.gif"></P>
      <P> <A HREF="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646179" target="_new">More 
        about logging in to the project server</A><BR>
        <A HREF="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646180" target="_new">More 
        about checking out source files</A> 
      <P> 
      <HR noShade SIZE=1>
      <A NAME="cvsadd"></A><span class="InputHeader">Adding/committing files</span> 
      <P>WinCvs is not a file editor. You can use the file editor of choice on 
d53 14
a66 14
        you have completed your changes to files on your hard drive, you can <I>commit</I> 
        those changes back into the project's CVS repository.</P>
      <P>The following example shows the WinCvs window after committing some changes 
        in a directory containing html content files.</P>
      <P><IMG src="images/wincvs_afterchange.gif"></P>
      <P>Whenever you <I>create</I> a new file on your hard disk and you want 
        to add that file to the project, an "unknown file" icon <IMG src="images/wincvs_unknown_icon.gif"> 
        will appear next to your new files.</P>
      <P>Select the new file and click the "Add Selected" <IMG src="images/wincvs_addselected.gif"> 
        or "Add Selected Binary" <IMG src="images/wincvs_addbinary.gif"> button 
        in the toolbar to mark the file as under version control. <BR>
      <blockquote>Use "<STRONG>Add Selected</STRONG> " for files that are basically 
        text files (e.g., *.txt or *.html).<BR>
        Use "<STRONG>Add Selected Binary</STRONG>" for files that have non-text 
d68 1
a68 1
      <strong>Note:</strong> Marking the file as "added" <I>does not</I> put it 
d70 3
a72 3
      <P></P>
      <P>Files that still need to be committed display a red icon <IMG src="images/wincvs_modified_icon.gif"> 
        next to them. To commit these files:</P>
d76 1
a76 1
        <li>Click the commit icon <IMG src="images/wincvs_commit_icon.gif"> in 
d80 2
a81 2
      <P>The results of the committing a file are displayed in the lower right-hand 
        pane. If problems or <I>conflicts</I> are encountered during the merge, 
d84 9
a92 9
      <P><IMG src="images/wincvs_commit.gif"></P>
      <P> <A HREF="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646186" target="_new">More 
        about adding files</A><BR>
        <A HREF="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646185" target="_new">More 
        about committing files</A> 
      <P> 
      <HR noShade SIZE=1>
      <A NAME="cvsupdate"></A><span class="InputHeader">Updating/merging files</span> 
      <P>You should always update your working copy of the project repository 
d97 1
a97 1
      <P>To update, select <strong>Update files...</strong> on the <strong>CVS 
d99 5
a103 5
      <P><IMG src="images/wincvs_update.gif"></P>
      <P> <A HREF="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646181" target="_new">More 
        about updating</A><BR>
        <A HREF="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646192" target="_new">More 
        about merging</A> 
d108 9
a116 9
<HR noShade SIZE=1>
      <A href="/servlets/HelpTOC">Back to main Help index</A> 
      <P></P>
      </span> </TD>
    <p></P>
</TR>
</TABLE>
</BODY>
</HTML>
@

