[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[TSVN] Documentation On Diffing

From: Jens Scheidtmann <Jens.Scheidtmann_at_bayerbbs.com>
Date: 2005-01-17 13:39:06 CET

I have written some paragraphs on diffing, for which information was
scarce in the current docs:

HTH,

Jens

Index: dug_showlog.xml
===================================================================
--- dug_showlog.xml (revision 2449)
+++ dug_showlog.xml (working copy)
@@ -161,6 +161,17 @@
                         </itemizedlist>
                 </para>
                 <para>
+ If you select two revisions at once (using the usual
+ <keycap>Ctrl</keycap>-modifier), the context menu changes and
+ only gives you three options: "Compare Revisions", "Show
+ Differences as Unified Diff" and "Search log messages ...". The
+ first fires up your log-viewer (TortoiseMerge, if you didn't
+ specify one in the options) and visually compares the two
+ revisions, the second spits out the differences between the two
+ revisions as unified diff, while the last one opens the search
+ dialog as described above.
+ </para>
+ <para>
                         <figure id="tsvn-DUG-showlog-2-dia-2">
                                 <title>The Log Dialog Bottom Pane with Context Menu</title>
                                 <graphic fileref="images/LogContextMenu2.png"/>
Index: dug_wcstatus.xml
===================================================================
--- dug_wcstatus.xml (revision 2449)
+++ dug_wcstatus.xml (working copy)
@@ -99,6 +99,66 @@
                         and should be used economically.
                 </para>
         </sect2>
+ <sect2>
+ <title>TortoiseSVN Columns In Explorer</title>
+ <indexterm>
+ <primary>Explorer Columns</primary>
+ </indexterm>
+ <para>
+ The same information which is available from the icon overlays
+ (and much more) can be displayed as additional columns in
+ Explorer's Detailed View.
+ </para>
+ <para>
+ Simply right click on one of the headings of a colum, choose
+ <guimenuitem>More...</guimenuitem> from the context menu displayed. A
+ dialog will appear where you can specify the columns and their
+ order, which is displayed in the "Detailed View". Scroll down
+ until the entries starting with SVN come into view. Check the
+ ones you would like to have displayed and close the dialog by
+ pressing <guibutton>OK</guibutton>. The columns will be appended
+ to the right of the currently displayed. You can reorder them by
+ drag and drop or resize them, so that they fit your needs.
+ </para>
+ <tip>
+ <para>
+ If you want the current layout to be displayed in all your
+ working copies, you may want to make this the default one.
+ </para>
+ <para>
+ In Explorer choose <guimenuitem></guimenuitem>, press
+ <guibutton></guibutton>.
+ </para>
+ </tip>
+ </sect2>
+ <sect2 id="tsvn-DUG-diffing">
+ <title>Viewing Diffs</title>
+ <indexterm>
+ <primary>diffing</primary>
+ </indexterm>
+ <para>
+ Often you want to look inside your files, to have a look at what
+ you've changed. You can accomplish this by selecting a file which
+ has changed, and selecting <guimenuitem>Diff</guimenuitem> from
+ TortoiseSVN's context menu. This starts the external
+ diff-viewer, which will then compare the current file to it's
+ contents, after the last checkout or update.
+ </para>
+ <tip>
+ <para>
+ Even when not inside a working copy or when you have multiple
+ versions of the file lying around, you can display diffs:
+ </para>
+ <para>
+ Select the two files you want to compare in explorer
+ (e.g. using <keycap>Ctrl</keycap> and the mouse) and
+ choose <guimenuitem>Diff</guimenuitem> from TortoiseSVN's
+ context menu. The file clicked last (the one with the focus,
+ i. e. the dotted rectangle) will be regarded the later
+ one.
+ </para>
+ </tip>
+ </sect2>
         <sect2 id="tsvn-DUG-wcstatus-2">
                 <title>Status Of The Repository</title>
                 <indexterm>

-- 
Jens.Scheidtmann@bayerbbs.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jan 17 13:40:14 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.