/usr/share/doc/subcommander/html/ch02s04.html is in subcommander-doc 2.0.0~b5p2-5.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Log Dialog</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="The Subcommander Guide"><link rel="up" href="ch02.html" title="Chapter 2. subcommander"><link rel="prev" href="ch02s03.html" title="The Commands"><link rel="next" href="ch02s05.html" title="The Log Graph Dialog"></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">The Log Dialog</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s03.html">Prev</a> </td><th width="60%" align="center">Chapter 2. subcommander</th><td width="20%" align="right"> <a accesskey="n" href="ch02s05.html">Next</a></td></tr></table><hr></div><div class="section" title="The Log Dialog"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="sc_sec_LogDialog"></a>The Log Dialog</h2></div></div></div><a class="indexterm" name="idp482080"></a><p>The <span class="bold"><strong>Log Dialog</strong></span> is important for a
couple of different tasks. It is not only used to view the history of
commits but also to view differences between committed revisions and for
merging commits from a repository to a working copy.</p><div class="figure"><a name="idp483776"></a><p class="title"><b>Figure 2.17. subcommander Log Dialog</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Log.png" align="middle" alt="subcommander Log Dialog"></div></div></div><br class="figure-break"><div class="section" title="View the History on a Working Copy"><div class="titlepage"><div><div><h3 class="title"><a name="idp485256"></a>View the History on a Working Copy</h3></div></div></div><a class="indexterm" name="idp485648"></a><p>To view the history of your current working copy you need to open
the <span class="bold"><strong>Log Dialog</strong></span>. Select the working copy
in the Project Folder View and choose <span class="bold"><strong>log..</strong></span> from the WcFolder menu.</p><p>In the Log Dialog you can control the range of revisions you like
to see with the <span class="bold"><strong>Start/Stop Revision</strong></span>
controls. If you are only interested in the last 25 commits you can set
the <span class="bold"><strong>Limit</strong></span> to 25. Subcommander will
display at most 25 commits in the given revision range. You can also
disable the limit to get all revision in the given range. Press the
<span class="bold"><strong>Run</strong></span> button to retrieve the commit
messages.</p><p>The default settings will show you the latest 50 commits on the
selected working copy path: the start revision is head (the newest
availabe revision) and the stop revision is 0 (the oldest possible
commit). By having a limit of 50, subcommander will retrieve the latest
50 commits on the give path.</p><p>The commits are displayed in the <span class="bold"><strong>Revision
List</strong></span>. By selecting a revision its commit message is displayed
in the <span class="bold"><strong>Log Message</strong></span> editor and the files
and folder modified in this revision are listed in the <span class="bold"><strong>Changed Paths</strong></span> area. You can modifiy a commit
message to fix some errors by editing the message. To overwrite the
commit message in the repository press the <span class="bold"><strong>Set Log
Message</strong></span> button.</p><p>Note that the repository needs a
<span class="emphasis"><em>pre-revprop-change</em></span> hook that allows changing the
commit messages.</p><p>Using the <span class="bold"><strong>Find</strong></span> controls you can
search through the retrieved log messages for the entered text. A found
match gets highlighted in the Log Message editor. The <span class="bold"><strong>Prev</strong></span> and <span class="bold"><strong>Next</strong></span>
buttons jump to the previous or next occurence.</p></div><div class="section" title="View the History on a Repository"><div class="titlepage"><div><div><h3 class="title"><a name="idp493768"></a>View the History on a Repository</h3></div></div></div><a class="indexterm" name="idp494160"></a><p>Viewing the history on a repository item works in the same way as
for a working copy. Just open the log dialog on a repository item
(ReposFolder menu) instead of a working copy item.</p></div><div class="section" title="View Differences between Revisions"><div class="titlepage"><div><div><h3 class="title"><a name="idp495320"></a>View Differences between Revisions</h3></div></div></div><a class="indexterm" name="idp495712"></a><div class="simplesect" title="Repository Differences"><div class="titlepage"><div><div><h4 class="title"><a name="idp496384"></a>Repository Differences</h4></div></div></div><a class="indexterm" name="idp496768"></a><p>After selecting two entries in the Revision List you can view
the difference between them by running <span class="bold"><strong>diff</strong></span> from the context menu. The diff menu item
is only enabled if you select exactly two items.</p><p>Subcommander will show the differences of a single file by
running submerge. If you did open the Log Dialog on a folder and not
just on a single file subcommander will show each file with
differences one by one.</p></div><div class="simplesect" title="Working Copy Differences"><div class="titlepage"><div><div><h4 class="title"><a name="idp498984"></a>Working Copy Differences</h4></div></div></div><a class="indexterm" name="idp499368"></a><p>Generally viewing the differences from a working copy Log Dialog
works the same way as viewing them from a repository Log Dialog. The
only difference is that you can also run diff on a single selected
item from the Revision List. In this case subcommander will show the
differences between the selected revision and your current working
copy.</p></div></div><div class="section" title="Merge into the Working Copy"><div class="titlepage"><div><div><h3 class="title"><a name="idp501048"></a>Merge into the Working Copy</h3></div></div></div><a class="indexterm" name="idp501432"></a><p>A common merge scenario is that you need to merge a single or
muliple changes or bug fixes from your development branch into your
current release branch.</p><p>Subcommander makes this an easy task. Make the merge target
working copy your current working copy and open the Log Dialog on the
source repository url with the changes you want to merge.</p><p>Now simply select the revision from the Revision List and select
<span class="bold"><strong>merge</strong></span> from the menu or the context menu
to merge the selected revision into your current working copy.
Subcommander will open the Merge Dialog with source of merge, source
revisions and target working copy filled up. Hit ok in the Merge Dialog
and your done.</p><p>In the same way you can easily merge a range of revisions. Select
the first and the last revision of the range you like to merge in the
Revision List and run merge again. Subcommander will fill the Merge
Dialog with the given revision range.</p></div><div class="section" title="Undo-ing a Commit from the Working Copy"><div class="titlepage"><div><div><h3 class="title"><a name="idp504376"></a>Undo-ing a Commit from the Working Copy</h3></div></div></div><a class="indexterm" name="idp504776"></a><p>From time to time it happens that one commits something wrong or
broken to the repository. You can't revert the commit to the repository
but you can do another commit that undos the comitted changes.</p><p>This works by reverse merging the wrong commit into your working
copy and comitting the working copy again. Reverse merging means to
switch the revisions used to merge. If your wrong commit was revision 10
(with 9 being the previous head revision) you tell subcommander to
reverse merge the commit by specifying revision 10 as the from revision
and revision 9 as the to revision.</p><p>To make this taks easier subcommander prefills the revisions in
the correct reverse merge order if you choose <span class="bold"><strong>undo</strong></span> instead of <span class="bold"><strong>merge</strong></span> from the menu.</p><p>All other steps are the same as with merging.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s03.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s05.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">The Commands </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> The Log Graph Dialog</td></tr></table></div></body></html>
|