<?php $isip_window_title = "ISIP Homepage"; ?>
<?php include("/data/isip/www/templates/documentation/header/header.html"); ?>

<!--#set var="isip_page_title" value="tkdiff" -->
<!--#include virtual="/hse/ies/templates/documentation/body/index_utility.html" -->
<?php include("/data/isip/www/templates/documentation/body/bar.html"); ?>

<a name="name">
<b>
name:
<a href="/perl/ifc_document.pl?file=$isip/util/devel/tkdiff/isip_tkdiff.tcl">isip_tkdiff.tcl</a>
</b>

<br><br>

<a name="synopsis">
<b>synopsis:</b>
<br><br>

<blockquote>
<pre>
isip_tkdiff [-Vbiw] [-D date] [-r version_tag] file1 file2
</pre>
</blockquote>

<a name="quick_start">
<b>quick start:</b>
<br><br>

<blockquote>
<pre>
isip_tkdiff x.cc y.cc;
isip_tkdiff -r isip_r00_n05 Integral.h;
</pre>
</blockquote>

<a name="description"> 
<b>description:</b>
<br><br>

<ul>
  This is a graphical file comparison utility. It has built-in support
  for CVS and RCS.

</ul>
  
<a name="options">
<b>options:</b>
<br><br>

<ul>
<li> -V: compare against repository version
     <br><br>
<li> -D: use the most recent revision no later than date. see -r for how
     this affects the comparison. Note that if -D is specified -V is
     assumed.
     <br><br>
<li> -r: revision number to compare against. zero, one, or two -r options
     may be present. with no -r option, the working file will be
     compared against revision it was based on. with one -r option,
     the working copy will be compared against that revision. With two
     -r options, the two revisions will be compared. One or two -r
     options can be replaced with -D options. Note that if -r is
     specified -V is assumed.
     <br><br>
<li> -n: allow cvs diff to operate without locks (generally safe for diff)
     <br><br>
<li> -b: ignore trailing blanks
     <br><br>
<li> -i: ignore case
     <br><br>
<li> -w: ignore all blanks and whitespace
</ul>       

<a name="operands">
<b>operands:</b>
<br><br>

<ul>
  If no arguments are present:
  <br><br>
<ul>
  if the -V, -D, or -r is specified it will compare the current
  cvs working copy against the revision it was based on in directory
  mode.
<br><br>
  if not in cvs mode (no -V, -D, or -r flag), it will error:
  <br><br>
</ul>
If one argument is present:
<ul>
  <br><br>
  if the one argument is a file:
  <br><br>
  <ul>
     if this is a cvs directory, it will compare the file against the
     revision it was based on.
<br><br>
     if it is not a cvs directory, it will error.
  <br><br>
  </ul>
  if the one argument is a directory:
  <br><br>
  <ul>
     if this is a cvs directory it will compare the working copy
     directory specified against the revision it was based on in
     directory mode. It will assume the -V flag. The behaviour in this
     mode will be modified by -r and -D options. 
<br><br>
     Note that: `tkdiff -V` and `tkdiff .` are equivalent. 
<br><br>     
     if it is not a cvs directory it will error.
<br><br>
  </ul>
If two arguments are present:
<br><br>
  <ul>
  if the -V, -r, or -D flags are not specified and neither is a
  directory, it will just compare the two files.
<br><br>
  if the -V, -r, or -D flags are not specified and both are
  directories, then it will do a directory compare against the two
  directories.
<br><br>

  if one arg is a file and the other is a directory and it is not in
  cvs mode, it will error.
</ul>
</ul>

</ul>

<a name="examples">
<b>examples:</b>
<br><br>

<ul>
  <li> This example shows how to compare two files:

<pre>
isip_tkdiff x.cc y.cc</pre>
</pre>

  <li> This example shows how to compare a file against the repository
       revision:
<pre>
isip_tkdiff x.cc</pre>
</pre>
  <li> This example shows how to compare the current directory against the repository revision:
<pre>
isip_tkdiff</pre>
</pre>
  <li> This example shows how to compare a file for changes in the past 7 days:
<pre>
isip_tkdiff -D 7_days_ago x.cc</pre>
</pre>

</ul>
       
<a name="manuals">
<b>manuals:</b>
<br><br>

<ul>
  None.
</ul>
       
<a name="languages">
<b>languages:</b>
<br><br>

<ul>
  Tcl
</ul>
       
<a name="variables">
<b>environment variables:</b>
<br><br>

<ul>

</ul>

<a name="files">
<b>files:</b>
<br><br>

<ul>
</ul>
       
<a name="see_also">
<b>see also:</b>
<br><br>

<ul>
</ul>

<a name="notes">
<b>notes:</b>
<br><br>

<ul>
</ul>

<!--#include virtual="/hse/ies/templates/documentation/footer/footer.html" -->
