| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" |
| "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd"> |
| |
| <html xmlns="http://www.w3.org/1999/xhtml"> |
| <head> |
| <style type="text/css"> |
| /* <![CDATA[ */ @import "/branding/css/tigris.css"; /* ]]> */ |
| </style> |
| <script src="/branding/scripts/sc.js" type="text/javascript"></script> |
| <link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print" /> |
| |
| <title>Managing files in WinCVS</title> |
| </head> |
| |
| <body class="docs" onload="self.focus()"> |
| <div class="docs" id="ddusingwincvs02"> |
| <h2>Managing files in WinCvs</h2> |
| |
| <div id="toc"> |
| <ul> |
| <li><strong><a href="/nonav/servlets/HelpTOC">Help index</a></strong></li> |
| </ul> |
| |
| <ul> |
| <li><a href="/nonav/docs/ddUsingWinCvs.html">Setting up WinCvs</a></li> |
| |
| <li><a href="/nonav/docs/ddUsingWinCvs-01.html">Checking source files in and out of WinCvs</a></li> |
| |
| <li> |
| 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 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.wincvs.org/winhtml/wincvs11.htm#_Toc453646183">More about comparing files with diff</a></p> |
| |
| <div class="courtesylinks"> |
| <p><a href="#toc">Top</a> | <a href="/nonav/servlets/HelpTOC">Help index</a></p> |
| </div> |
| </div> |
| </body> |
| </html> |
| |
| |
