📄 ch03s28.html
字号:
<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <title>Diff</title> <link rel="stylesheet" href="corpstyle.css" type="text/css"> <meta name="generator" content="DocBook XSL Stylesheets V1.65.1"> <link rel="home" href="index.html" title="The eSvn User Manual"> <link rel="up" href="ch03.html" title="Chapter 3. Using eSvn"> <link rel="previous" href="ch03s27.html" title="Properties"> <link rel="next" href="ch03s29.html" title="Quick Diff"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> <div class="navheader"> <table width="100%" summary="Navigation header"> <tr> <th colspan="3" align="center">Diff</th> </tr> <tr> <td width="20%" align="left"><a accesskey="p" href="ch03s27.html"><img src="common/navig/prev.gif" alt="Prev"></a> </td> <th width="60%" align="center">Chapter 3. Using eSvn</th> <td width="20%" align="right"> <a accesskey="n" href="ch03s29.html"><img src="common/navig/next.gif" alt="Next"></a></td> </tr> </table> <hr> </div> <div class="sect1" lang="en"> <div class="titlepage"> <div> <div> <h2 class="title" style="clear: both"><a name="esvn-diff"></a>Diff </h2> </div> </div> <div></div> </div> <p>To view the difference between the select working copy file and a revision,in the repository, or between any of two revisions use the Diff option ( <span class="guimenu">Query</span>-><span class="guimenuitem">Diff</span> (<span><b class="shortcut"><span><b class="keycap">F9</b></span></b></span>) ). The Diff option also enables difference checking between files resiting in the repository. The <tt class="interfacename">Diff</tt> dialog provides the following options: </p> <div class="figure"><a name="fig-diff"></a><p class="title"><b>Figure 3.2. Diff</b></p> <div class="screenshot"> <div class="mediaobject"> <table border="0" summary="manufactured viewport for HTML img" cellspacing="0" cellpadding="0" width="354"> <tr> <td><img src="images/diff.png" width="354" alt="Diff"></td> </tr> </table> </div> </div> </div> <div class="variablelist"> <dl> <dt><span class="term"> <span class="bold"><b>Revision</b></span> </span></dt> <dd> <p>Select the radio button and enter a value equal to a revision number. Use the <span><b class="guibutton">R</b></span> to display the Log information and select a revision number or use <tt class="varname">KEYWORDS</tt>: </p> <div class="variablelist"> <dl> <dt><span class="term">HEAD</span></dt> <dd> <p>The latest revision in the repository.</p> </dd> <dt><span class="term">BASE</span></dt> <dd> <p>The "pristine" revision of an item in a working copy.</p> </dd> <dt><span class="term">COMMITTED</span></dt> <dd> <p>The last revision in which an item changed before (or at) BASE.</p> </dd> <dt><span class="term">PREV</span></dt> <dd> <p>The revision just before the last revision in which an item changed. (Technically, <span><b class="command">COMMITTED - 1</b></span>.) </p> </dd> </dl> </div> <p>Use the <span><b class="guibutton">H</b></span>, <span><b class="guibutton">P</b></span>, or <span><b class="guibutton">B</b></span> button to specify the <tt class="envar">HEAD</tt>, <tt class="envar">PREV</tt> or <tt class="envar">BASE</tt> keywords respectively. </p> </dd> <dt><span class="term"> <span class="bold"><b>Date</b></span> </span></dt> <dd> <p>Select the radio button and enter a value equal to a revision date or time. Specify date or time using any of the following syntax: </p> <div class="itemizedlist"> <ul type="disc" compact> <li> <p>2004-02-17</p> </li> <li> <p>15:30</p> </li> <li> <p>15:30:00.200000</p> </li> <li> <p>2004-02-17 15:30</p> </li> <li> <p>2004-02-17 15:30 +0230</p> </li> <li> <p>2004-02-17T15:30</p> </li> <li> <p>2004-02-17T15:30Z</p> </li> <li> <p>2004-02-17T15:30-04:00</p> </li> <li> <p>20040217T1530</p> </li> <li> <p>20040217T1530Z</p> </li> <li> <p>20040217T1530-0500</p> </li> </ul> </div> </dd> <dt><span class="term"> <span class="bold"><b>External diff</b></span> </span></dt> <dd> <p>Uses the diff application specified in the <i class="guilabel">Diff</i> field of the <tt class="interfacename">Options</tt> dialog (see <a href="ch03s07.html" title="Configuring Options">the section called “Configuring Options”</a>). The diff application has to support executing with two file names in the command line </p> </dd> <dt><span class="term"> <span class="bold"><b>Non-recursive</b></span> </span></dt> <dd> <p>When performing diff operation on a folder the operation is only performed on the selected folder and not an y sub folders. </p> </dd> <dt><span class="term"> <span class="bold"><b>Notice ancestry</b></span> </span></dt> <dd> <p>???</p> </dd> <dt><span class="term"> <span class="bold"><b>Extension</b></span> </span></dt> <dd> <p>String of parameters what will be sent as-is to the diff application</p> </dd> <dt><span class="term"> <span class="bold"><b>URL/File 1</b></span> </span></dt> <dd> <p>The path to the first folder or file located in the repository. Use the <span><b class="guibutton">U</b></span> button to display the <tt class="interfacename">URL Wizard</tt> which can be used to specify the path. </p> </dd> <dt><span class="term"> <span class="bold"><b>URL/File 2</b></span> </span></dt> <dd> <p>The path to the second folder or file located in the repository. Use the <span><b class="guibutton">U</b></span> button to display the <tt class="interfacename">URL Wizard</tt> which can be used to specify the path. </p> </dd> </dl> </div> </div> <div class="navfooter"> <hr> <table width="100%" summary="Navigation footer"> <tr> <td width="40%" align="left"><a accesskey="p" href="ch03s27.html"><img src="common/navig/prev.gif" alt="Prev"></a> </td> <td width="20%" align="center"><a accesskey="u" href="ch03.html"><img src="common/navig/up.gif" alt="Up"></a></td> <td width="40%" align="right"> <a accesskey="n" href="ch03s29.html"><img src="common/navig/next.gif" alt="Next"></a></td> </tr> <tr> <td width="40%" align="left" valign="top">Properties </td> <td width="20%" align="center"><a accesskey="h" href="index.html"><img src="common/navig/home.gif" alt="Home"></a></td> <td width="40%" align="right" valign="top"> Quick Diff</td> </tr> </table> </div> </body></html>⌨️ 快捷键说明
复制代码
Ctrl + C
搜索代码
Ctrl + F
全屏模式
F11
切换主题
Ctrl + Shift + D
显示快捷键
?
增大字号
Ctrl + =
减小字号
Ctrl + -