head	1.5;
access;
symbols
	TIGRIS_1_1_0RC2:1.2.6.1
	TIGRIS_1_1_0RC1:1.2.6.1
	TIGRIS_1_1:1.2.6.1.0.2
	TIGRIS_1_0_8:1.2.6.1
	TIGRIS_1_0_8RC3:1.2.6.1
	TIGRIS_1_0_8RC2:1.2.6.1
	TIGRIS_1_0_8RC1:1.2.6.1
	TIGRIS_1_0_7:1.2.6.1
	TIGRIS_1_0_7RC3:1.2.6.1
	TIGRIS_1_0_7RC2:1.2.6.1
	TIGRIS_1_0_7RC1:1.2.6.1
	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.55;	author lori;	state Exp;
branches
	1.2.6.1;
next	1.1;

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

1.2.6.1
date	2001.06.21.00.02.49;	author lori;	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="ddusingwincvs02">
   <h2>Managing files in WinCvs</h2>

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

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

     <li><a href="ddUsingWinCvs-01.html">Checking source files in and out of WinCvs</a></li>

     <li>
      <strong>You are here:</strong> Managing files in WinCvs 

      <ul>
       <li><a href="#cvstatus">Finding out file status</a></li>

       <li><a href="#diff">Comparing different versions of files</a></li>
      </ul>
     </li>
    </ul>
   </div>

   
  <h3><a id="cvstatus" name="cvstatus">Finding out File Status</a></h3>

   
  <p>If you need to find the status of a file relative to the version in the CVS 
    repository, select the file and select <strong>Status selection</strong> in 
    the <strong>Query</strong> menu. The file's status, working revision number, 
    and repository revision number are displayed in the bottom pane.</p>
  <h4>CVS Status Definitions</h4>

   <dl>
    <dt>Locally modified</dt>

    <dd>Your working file contains changes made after the latest version in the repository.</dd>

    <dt>Unknown</dt>

    <dd>Your file is not part of the CVS repository. The file needs&#160;to be added, then committed.</dd>

    <dt>Up-to-date</dt>

    <dd>Your working file is current with the latest version in the repository. <!-- merge conflict message? --></dd>
   </dl>

   
  <h3><a id="diff" name="diff">Comparing Different Versions of Files</a></h3>

   
  <p>There may be circumstances when you want to compare the repository version 
    to your file <i>before</i> you commit your changes. Sometimes you may have 
    made some particularly complex modifications to a file that you know someone 
    else has also worked on. Selecting <strong>Diff selection</strong> in the <strong>Query</strong> 
    menu allows you to compare your file against the file in the cvs repository, 
    or against earlier versions.</p>
  <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646183">More about 
    comparing files with diff</a></p>

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


@


1.4
log
@html usage revision
@
text
@d24 2
a25 1
   <h3><a id="cvstatus" name="cvstatus">Finding out file status</a></h3>
d27 6
a32 3
   <p>If you need to find the status of a file relative to the version in the CVS repository, select <strong>Status files</strong> in the <strong>CVS files</strong> menu and select the file. The file's status, working revision number, and repository revision number are displayed in the bottom right-hand pane.</p>

   <h3>CVS status definitions</h3>
d48 2
a49 7
   <p><img alt="" src="images/wincvs_status.gif" height="396" width="441" /></p>

   <h3><a id="diff" name="diff">Comparing different versions of files</a></h3>

   <p>There may be circumstances when you want to compare the repository version to your file <i>before</i> you commit your changes. Sometimes you may have made some particularly complex modifications to a file that you know someone else has also worked on. Selecting "Diff files..." in the "Cvs files" menu allows you to compare your file against the file in the cvs repository, or against earlier versions.</p>

   <p><img alt="" src="images/wincvs_diff.gif" height="396" width="441" /></p>
d51 9
a59 1
   <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646183">More about comparing files with diff</a></p>
@


1.3
log
@extensive markup rework - first pass toward house xhtmlification
@
text
@d1 2
a2 11
<!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.c3 {font-style: italic; font-weight: bold}
 dt.c2 {font-weight: bold}
 p.c1 {font-weight: bold}
</style>
 </head>
d4 2
a5 2
 <body>
  
d7 2
a8 6
<div class="docs" id="docid">
<h2>Managing files in WinCvs</h2>

  <p>Help for WinCvs: Index</p>

  
d10 1
a10 2
  <dl>
   <dt><a href="ddUsingWinCvs.html">Setting up WinCvs</a></dt>
d12 2
a13 1
   <dt><a href="ddUsingWinCvs-01.html">Checking source files in and out of WinCvs</a></dt>
d15 2
a16 1
   <dt class="c2">You are here: Managing files in WinCvs</dt>
d18 3
a20 5
   <dd>
    <ul>
     <li><b><a href="#cvstatus">Finding out file status</a></b></li>

     <li><b><a href="#diff">Comparing different versions of files</a></b></li>
d22 1
a22 6
   </dd>
  </dl>
  
   <h3><a id="cvstatus" name="cvstatus">Finding out file status</a></h3> 

  <p>If you need to find the status of a file relative to the version in the CVS repository, select <strong>Status files</strong> in the <strong>CVS files</strong> menu and select the file. The file's status, working revision number, and repository revision number are displayed in the bottom right-hand pane.</p>
d24 1
a24 1
  <p>CVS status definitions:</p>
d26 1
a26 2
  <dl>
   <dt class="c3">Locally modified</dt>
d28 1
a28 1
   <dd>Your working file contains changes made after the latest version in the repository.</dd>
d30 2
a31 1
   <dt class="c3">Unknown</dt>
d33 1
a33 1
   <dd>Your file is not part of the CVS repository. The file needs&#160;to be added, then committed.</dd>
d35 1
a35 1
   <dt class="c3">Up-to-date</dt>
d37 1
a37 2
   <dd>Your working file is current with the latest version in the repository. <!-- merge conflict message? --></dd>
  </dl>
d39 1
a39 1
  <p><img alt="" src="images/wincvs_status.gif" height="396" width="441" /></p>
d41 2
a42 1
  
d44 1
a44 3
  
  
  <h3><a id="diff" name="diff">Comparing different versions of files</a></h3> 
d46 1
a46 1
  <p>There may be circumstances when you want to compare the repository version to your file <i>before</i> you commit your changes. Sometimes you may have made some particularly complex modifications to a file that you know someone else has also worked on. Selecting "Diff files..." in the "Cvs files" menu allows you to compare your file against the file in the cvs repository, or against earlier versions.</p>
d48 1
a48 1
  <p><img alt="" src="images/wincvs_diff.gif" height="396" width="441" /></p>
d50 1
a50 1
  <p><a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646183">More about comparing files with diff</a></p>
d52 1
a52 1
  
d54 5
a58 6
  
  
<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 8
a11 1
<head>
d13 2
a14 1
<title>Using WinCVS</title>
d16 2
a17 2
</head>
<body>
d19 1
a19 51
<p>
    <p><span class="Header" nowrap>Managing files in WinCvs</span>
	
<span class="PlainText"> 
    <p><b>Help for WinCvs: Index</b>
<p>
     
   
      <dl> 
        <dt><a href="ddUsingWinCvs.html">Setting up WinCvs</a> 
        <dt><a href="ddUsingWinCvs-01.html">Checking source files in and out of 
          WinCvs</a> 
        <dt><b>You are here: Managing files in WinCvs 
          <ul>
            <li><a href="#cvstatus">Finding out file status</a>
			<li><a href="#diff">Comparing different versions 
      of files</a> </li>
          </ul></b>
      </dl>
<hr noshade size=1>
      <a name="cvstatus"></a><span class="InputHeader">Finding out file status</span> 
      <p>If you need to find the status of a file relative to the version in the CVS repository, select <strong>Status files</strong> in the <strong>CVS files</strong> menu and select the file. The file's status, working revision number, and repository revision number are displayed in the bottom right-hand pane.

<p>CVS status definitions:
<p><dl>
<dt><b><i>Locally modified</i></b> <dd>Your working file contains changes made after the latest version in the repository.
<dt><b><i>Unknown</i></b> <dd> Your file is not part of the CVS repository. The file needs&nbsp;to be added, then committed.
<dt><b><i>Up-to-date</i></b> <dd>Your working file is current with the latest version in the repository.
<!-- merge conflict message? --></dd>
</dl>

<p><img src="images/wincvs_status.gif"></p>
<p>

<p>

<hr noshade size=1>
      <a name="diff"></a><span class="InputHeader">Comparing different versions 
      of files</span> 
      <p>There may be circumstances when you want to compare the repository version to your file <i>before</i> you commit your changes. Sometimes you may have made some particularly complex modifications to a file that you know someone else has also worked on. Selecting "Diff files..." in the "Cvs files" menu allows you to compare your file against the file in the cvs repository, or against earlier versions.

<p><img src="images/wincvs_diff.gif"></p>
<p>
<a href="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646183" target="_new">More about comparing files with diff</a>
<p>

<p>

<hr noshade size=1>
<a href="/servlets/HelpTOC">Back to main Help index</a>
      <p></p>
d21 1
a21 1
<p></p>
d23 56
a78 1
</span>
d81 2
@


1.2.6.1
log
@added cvs status info
@
text
@d33 6
a38 34
<p>
<dl>
 <dt><i>Locally Added</i></dt>
     <dd>You have added the file with `add', and not yet committed your
     changes.</dd>

	<dt><i>Locally Removed</i></dt>
     <dd>You have removed the file with `remove', and not yet committed
     your changes.</dd>

	<dt><i>Needs Checkout</i></dt>
     <dd>Someone else has committed a newer revision to the repository.
     The name is slightly misleading; you will ordinarily use `update'
     rather than `checkout' to get that newer revision.</dd>

   <dt><i>Needs Patch</i></dt>

   <dd>Like Needs Checkout, but the CVS server will send a patch rather
     than the entire file. Sending a patch or sending an entire file
     accomplishes the same thing.</dd>

   <dt><i>Needs Merge</i></dt>
     <dd>Someone else has committed a newer revision to the repository, and
     you have also made modifications to the file.</dd>

   <dt><i>File had conflicts on merge</i></dt>

   <dd>This is like Locally Modified, except that a previous `update'
     command gave a conflict and CVS could not resolve the changes made.  If you have not already done so, you need to open the file in an editor and <a href="ddCVS_cvscontributing.html#cvsresolving">resolve the conflict</a>.</dd>

   <dt><i>Unknown</i></dt>
     <dd>CVS doesn't know anything about this file.  For example, you have
     created a new file and have not run `cvs add'.</dd>
  </dl>
@


1.1
log
@broke the 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 12
</HEAD>
<BODY>
<TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2" width="100%" >
  <TR>
<P>
    <P><span class="Header" nowrap>Managing files in WinCvs</span>
	</TR></TABLE>

<TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2" width="100%" >
  <TR>
 <TD class="PlainText"> 
    <P><SPAN class=InputHeader>Help for WinCvs: Index</SPAN>
d9 6
d20 2
a21 2
          WinCvs</A> 
        <dt>You are here: Managing files in WinCvs 
d24 3
a26 3
			<li><A href="#diff">Comparing different versions 
      of files</A> </LI>
          </UL>
d28 11
a38 12
<HR noShade SIZE=1>
      <A NAME="cvstatus"></A><span class="InputHeader">Finding out file status</span> 
      <P>If you need to find the status of a file relative to the version in the cvs repository, select <strong>Status files</strong> in the <strong>CVS files</strong> menu and select the file. The file's status, working revision number, and repository revision number are displayed in the bottom right-hand pane.

<P>CVS status definitions:
<P><DL>
<DT><B><I>Locally modified</I></B> <DD>Your working file contains changes made after the latest version in the repository.
<DT><B><I>Unknown</I></B> <DD>    Your file is not part of the CVS repository. The file needs&nbsp;to be added, then committed.
<DT><B><I>Up-to-date</I></B> <DD>Your working file is current with the latest 
        version in the repository.
<!-- merge conflict message? --></DD>
</DL>
d40 2
a41 2
<P><IMG src="images/wincvs_status.gif"></P>
<P>
d43 1
a43 1
<P>
d45 2
a46 2
<HR noShade SIZE=1>
      <A NAME="diff"></A><span class="InputHeader">Comparing different versions 
d48 1
a48 1
      <P>There may be circumstances when you want to compare the repository version to your file <I>before</I> you commit your changes. Sometimes you may have made some particularly complex modifications to a file that you know someone else has also worked on. Selecting "Diff files..." in the "Cvs files" menu allows you to compare your file against the file in the cvs repository, or against earlier versions.
d50 16
a65 16
<P><IMG src="images/wincvs_diff.gif"></P>
<P>
<A HREF="http://www.cvsgui.org/winhtml/wincvs11.htm#_Toc453646183" target="_new">More about comparing files with diff</A>
<P>

<P>

<HR noShade SIZE=1>
<A href="/servlets/HelpTOC">Back to main Help index</A>
      <P></P>

</TD><p></P>
</TR>
</TABLE>
</BODY>
</HTML>
@

