<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML
><HEAD
><TITLE
>Watching differences between revisions</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
REL="HOME"
TITLE="Cervisia Manual"
HREF="index.html"><LINK
REL="UP"
TITLE="Obtaining information about files"
HREF="obtaininginformation.html"><LINK
REL="PREVIOUS"
TITLE="Browsing the history"
HREF="browsinghistory.html"><LINK
REL="NEXT"
TITLE="Watching an annotated view of a file"
HREF="annotate.html"><META
HTTP-EQUIV="Content-Style-Type"
CONTENT="text/css"><META
NAME="Generator"
CONTENT="KDE DBMSS Customisation $Revision: 1.65 $"><LINK
REL="stylesheet"
HREF="common/kde-common.css"
TYPE="text/css"><META
HTTP-EQUIV="Content-Type"
CONTENT="text/html; charset=iso-8859-1"><META
HTTP-EQUIV="Content-Language"
CONTENT="en"><LINK
REL="stylesheet"
HREF="common/kde-localised.css"
TYPE="text/css"
TITLE="KDE-English"><LINK
REL="stylesheet"
HREF="common/kde-default.css"
TYPE="text/css"
TITLE="KDE-Default"></HEAD
><BODY
CLASS="SECT1"
BGCOLOR="#FFFFFF"
TEXT="#000000"
LINK="#AA0000"
VLINK="#AA0055"
ALINK="#AA0000"
STYLE="font-family: sans-serif; position:absolute; left: 0px; top: 0px; right: 0px; bottom: 0px;"
><TABLE
CLASS="navheader"
BORDER="0"
CELLPADDING="0"
CELLSPACING="0"
><TR
><TD
CLASS="bulb"
><IMG
SRC="common/doctop1.png"
ALT=""
WIDTH="150"
HEIGHT="85"></TD
><TD
COLSPAN="2"
HEIGHT="85"
CLASS="headline"
><H1
><SPAN
CLASS="APPLICATION"
>Cervisia</SPAN
> Manual</H1
></TD
></TR
><TR
STYLE="background-color: #515151;"
CLASS="navrow"
><TD
ALIGN="left"
CLASS="left"
HEIGHT="25"
><A
HREF="browsinghistory.html"
>Prev</A
></TD
><TD
ALIGN="center"
CLASS="center"
HEIGHT="25"
>Chapter 3. Obtaining information about files </TD
><TD
ALIGN="right"
CLASS="right"
HEIGHT="25"
><A
HREF="annotate.html"
>Next</A
></TD
></TR
><TR
><TD
COLSPAN="3"
CLASS="shadow"
><IMG
WIDTH="100%"
SRC="common/shadow.png"
ALT=""
HEIGHT="14"></TD
></TR
></TABLE
><DIV
CLASS="SECT1"
><H1
CLASS="SECT1"
><A
NAME="DIFF"
>3.3. Watching differences between revisions</A
></H1
><P
> There are several places in <SPAN
CLASS="APPLICATION"
>Cervisia</SPAN
> where you can ask for
a window showing the differences between revisions of a file:
<UL
><LI
><P
> In the main view, you can choose
<SPAN
CLASS="GUIMENU"
>View</SPAN
>-><SPAN
CLASS="GUIMENUITEM"
>Difference to repository...</SPAN
>.
This is based on the command
<B
CLASS="COMMAND"
>cvs diff</B
> and shows you the differences between the
version in your sandbox and the version to which you last updated (also
known as BASE). This is in particular useful just before you commit
a file, so you can find an appropriate log message.
</P
></LI
><LI
><P
> In the dialog that is shown when a you commit a set of files,
you can request a difference window by selecting a file
name in the selection list, either by double-clicking it or
by pressing <B
CLASS="KEYCAP"
>Return</B
>. This is quite similar
to using
<SPAN
CLASS="GUIMENU"
>View</SPAN
>-><SPAN
CLASS="GUIMENUITEM"
>Difference to repository...</SPAN
>
with the respective file in the main view.
</P
></LI
><LI
><P
> In the Browse logs dialog, you can mark two revisions of
a file and request a dialog showing the differences between
them (see the section <A
HREF="obtaininginformation.html#BROWSINGLOGS"
>Section 3.1</A
>).
</P
></LI
></UL
>
</P
><P
> As you may have expected, <SPAN
CLASS="APPLICATION"
>Cervisia</SPAN
> does not just dump the output of
the <B
CLASS="COMMAND"
>diff</B
> command into your terminal, but shows you
a graphical view as seen in <A
HREF="diff.html#BROWSINGLOGSPIC"
>Figure 3-3</A
>.
</P
><DIV
CLASS="FIGURE"
><HR><A
NAME="BROWSINGLOGSPIC"
></A
><P
><B
>Figure 3-3. A screenshot of <SPAN
CLASS="APPLICATION"
>Cervisia</SPAN
>'s diff dialog</B
></P
><DIV
CLASS="MEDIAOBJECT"
><P
><IMG
SRC="diff.png"
></IMG
></P
></DIV
><HR></DIV
><P
> The text in the dialog is an improved variant of the text given by the
diff command with the <TT
CLASS="OPTION"
>-u</TT
> option. You can see the
differing versions in two windows, with lines arranged such that you can
do a side-by-side comparison. That means, where text has been added or
deleted, the respective window shows empty lines with the marker
<TT
CLASS="LITERAL"
>+++++</TT
> at the left hand side. Elsewhere, you can see
the running number of each line in the left column.
</P
><P
> In the second column in the right window, you can see which kind of change
has been made. Possible types are <TT
CLASS="LITERAL"
>Add</TT
>,
<TT
CLASS="LITERAL"
>Delete</TT
> and <TT
CLASS="LITERAL"
>Change</TT
>. The respective
lines are marked in blue, green and red color. In the middle of the dialog
a compressed image of the color markers is shown. In this way, you can
get a quick overview of the overall changes to the file. You can also
use the position of the colored regions in the compressed image as an
orientation when you using the scroll bars.
</P
><P
> Normally, the scrollbars at the left and the right window are synchronized,
i.e. if you scroll on the left hand side, the right hand side is scrolled
by the same amount. You can change this by checking the box
<SPAN
CLASS="GUIBUTTON"
>Synchronize scroll bars</SPAN
>.
</P
><P
> For information about how to customize the diff dialog,
see <A
HREF="customization.html#CUSTOMIZE-VARIOUS"
>Section 5.1</A
>.
</P
></DIV
><DIV
CLASS="NAVFOOTER"
><TABLE
WIDTH="100%"
BORDER="0"
CELLPADDING="0"
CELLSPACING="0"
><COLGROUP
><COL
WIDTH="*"><COL
WIDTH="227"></COLGROUP
><TBODY
><TR
><TD
CLASS="end"
WIDTH="100%"
><IMG
SRC="common/bottom1.png"
ALT=""
HEIGHT="59"></TD
><TD
><A
HREF="http://www.kde.org/"
><IMG
SRC="common/bottom2.png"
ALT="KDE Logo"
WIDTH="227"
BORDER="0"
HEIGHT="59"></A
></TD
></TR
><TR
><TD
HEIGHT="50"
COLSPAN="2"
> </TD
></TR
></TBODY
></TABLE
><TABLE
WIDTH="100%"
BORDER="0"
CELLPADDING="0"
CELLSPACING="0"
><TR
><TD
WIDTH="33%"
ALIGN="left"
VALIGN="top"
><A
HREF="browsinghistory.html"
>Prev</A
></TD
><TD
WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
HREF="index.html"
>Home</A
></TD
><TD
WIDTH="33%"
ALIGN="right"
VALIGN="top"
><A
HREF="annotate.html"
>Next</A
></TD
></TR
><TR
><TD
WIDTH="33%"
ALIGN="left"
VALIGN="top"
>Browsing the history</TD
><TD
WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
HREF="obtaininginformation.html"
>Up</A
></TD
><TD
WIDTH="33%"
ALIGN="right"
VALIGN="top"
>Watching an annotated view of a file</TD
></TR
></TABLE
></DIV
></BODY
></HTML
>
