/usr/share/doc/subcommander/html/ch02s03.html is in subcommander-doc 2.0.0~b5p2-5.1.
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 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Commands</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ch02s02.html" title="Projects & Bookmarks"><link rel="next" href="ch02s04.html" title="The Log 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 Commands</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s02.html">Prev</a> </td><th width="60%" align="center">Chapter 2. subcommander</th><td width="20%" align="right"> <a accesskey="n" href="ch02s04.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="sc_Commands"></a>The Commands</h2></div></div></div><p>This chapter describes the available commands for handling your
projects.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61324304"></a>Checkout a Working Copy</h3></div></div></div><a class="indexterm" name="idp61325040"></a><p>To work on a project you need a working copy. You create a working
copy by checking it out from a repository. There are two ways in
subcommander to do this: from a repository item or from a working copy
item. Normally you checkout from a repository item in the Project Folder
View.</p><div class="simplesect"><div class="titlepage"><div><div><h4 class="title"><a name="idp61327120"></a>Checkout from a Repository Item</h4></div></div></div><p>To checkout a working copy from a repository select a bookmark
in the Project Folder View or an item in the Repository View and
choose <span class="bold"><strong>checkout</strong></span> from the context
menu.</p><p>You can enter a <span class="bold"><strong>Working Copy
Path</strong></span> or select one by using <span class="bold"><strong>browse
Filesystem</strong></span>. You can not edit the repository URL. It is
filled with the URL of the selected repository item.</p><p>By default subcommander checks out the <span class="emphasis"><em>head</em></span>
revision from the repository. If you need another revision you can
select it from the <span class="bold"><strong>Revision</strong></span>
control.</p><p>Enabling <span class="bold"><strong>Add To Project</strong></span> tells
subcommander to add the new working copy to the current Project. The
working copy name will be the last section of its path.</p><div class="figure"><a name="idp61334224"></a><p class="title"><b>Figure 2.6. subcommander Checkout from Repository Item</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Checkout-1.png" align="middle" alt="subcommander Checkout from Repository Item"></div></div></div><br class="figure-break"></div><div class="simplesect"><div class="titlepage"><div><div><h4 class="title"><a name="idp61337328"></a>Checkout from a Working Copy Item</h4></div></div></div><p>Selecting a working copy item in the Project Folders View
normally shows the status of the working copy. In case your working
copy path is just a path and not a real working copy, for example
because you didn't select an existing working copy but an empty folder
in the project setup, subcommander will ask you to checkout a working
copy.</p><div class="figure"><a name="idp61338896"></a><p class="title"><b>Figure 2.7. subcommander Checkout from Working Copy Item</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Checkout-2.png" align="middle" alt="subcommander Checkout from Working Copy Item"></div></div></div><br class="figure-break"><p>The working copy path is filled with the path from the selected
working copy item. You can't modify it. This time you can only select
the <span class="bold"><strong>Repository URL</strong></span> you want to
checkout. The repository URL is populated with the trunk, branches and
tags URL you have configured in the project. You can modify it or
select another URL from the <span class="bold"><strong>browse
Repository</strong></span> button.</p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61344400"></a>Export from Working Copy or Repository</h3></div></div></div><a class="indexterm" name="idp61345152"></a><p>You can export from a repository URL or from a working copy path.
Select the <span class="bold"><strong>Source URL or Path</strong></span> in the
project folder view or a folder in the Working Copy View and choose
<span class="bold"><strong>export</strong></span> from the context menu.</p><p>In the export dialog you can enter the <span class="bold"><strong>Destination Path</strong></span> for the export. You may also
change the <span class="bold"><strong>Source Revsion</strong></span> or change the
<span class="bold"><strong>EOL style</strong></span>.</p><div class="figure"><a name="idp61351184"></a><p class="title"><b>Figure 2.8. subcommander Export Repository or Working Copy Item</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Export.png" align="middle" alt="subcommander Export Repository or Working Copy Item"></div></div></div><br class="figure-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61354288"></a>Update a Working Copy</h3></div></div></div><a class="indexterm" name="idp61355024"></a><p>To get the latest changes for your working copy from the
repository select the working copy item in the Project Folder View and
select <span class="bold"><strong>update</strong></span> from the context menu or
from the WcFolder menu.</p><p>If you want to update a working copy to a specific revision use
<span class="bold"><strong>update..</strong></span> instead of <span class="bold"><strong>update</strong></span>. <span class="bold"><strong>update..</strong></span>
will open a dialog where you can choose the revision. The dialog based
update is also available in te working copy view on individual
items.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61360656"></a>Add, Delete and Revert Items in a Working Copy</h3></div></div></div><p>You can add new items (files or folders) to a working copy, delete
items from a working copy and revert items (undo changes made to an
item) simply by selecting them in the Working Copy View and choosing the
corresponding add, delete or revert item from the Wc menu.</p><p>All three commands honor the current <span class="bold"><strong>Recursive</strong></span> setting (see <a class="xref" href="ch02s01.html#sc_ToolBar" title="Tool Bar">the section called “Tool Bar”</a>).</p><div class="simplesect"><div class="titlepage"><div><div><h4 class="title"><a name="idp61363888"></a>Add Items to a Working Copy</h4></div></div></div><a class="indexterm" name="idp61364640"></a><p>Unversioned items are displayed as <span class="emphasis"><em>unknown</em></span>
in the Working Copy View (see <a class="xref" href="ch02s01.html#sc_pic_WorkingCopyView" title="Figure 2.4. subcommander Working Copy View">Figure 2.4, “subcommander Working Copy View”</a>). Select the unversioned item and
choose <span class="bold"><strong>add</strong></span> from the context menu or
the <span class="bold"><strong>Wc</strong></span> menu to add it to the working
copy. You can select multiple items to add them in one step.</p><p>After reloading (using the <span class="bold"><strong>R</strong></span>
tool bar button, see <a class="xref" href="ch02s01.html#sc_ToolBar" title="Tool Bar">the section called “Tool Bar”</a>) the Working Copy
View subcommander shows the added item(s) with a blue
background.</p><p>Adding a folder will recursively add all sub items of that
folder.</p></div><div class="simplesect"><div class="titlepage"><div><div><h4 class="title"><a name="idp61371552"></a>Delete Items from a Working Copy</h4></div></div></div><a class="indexterm" name="idp61372304"></a><p>To delete an item from your working copy select it in the
Working Copy View and choose <span class="bold"><strong>delete</strong></span>
from the Wc menu. You can also select multiple items to delete them in
one step. Since by default subcommander shows only modified items in
the Working Copy View you may need to toggle the <span class="bold"><strong>View All</strong></span> button in the tool bar (See the
sidebar <span class="emphasis"><em>Recursive and View All</em></span> in <a class="xref" href="ch02s01.html#sc_ToolBar" title="Tool Bar">the section called “Tool Bar”</a>).</p><p>Deleting an added file does not only remove it from the working
copy but it also deletes it from the file system.</p><p>From time to time your working copy will contain unversioned
items you don't want to add to version control and you don't want to
ignore. You can remove those items (files or folders) in the same way
but note that you won't be able to restore them.</p><p>After reloading the Working Copy View the deleted items (when
they were versioned) are shown with a red background.</p></div><div class="simplesect"><div class="titlepage"><div><div><h4 class="title"><a name="idp61378832"></a>Revert Items in a Working Copy</h4></div></div></div><a class="indexterm" name="idp61379584"></a><p>You revert a modified item (green background) back to its
unmodified version by selecting it in the Working Copy View and
choosing <span class="bold"><strong>revert</strong></span> from the Wc menu. You
can select multiple items to revert all of them in one step.</p><p>Reverting an added item does only remove it from the working
copy. It does not delete it in the file system.</p><p>Reload the Working Copy View to update the working copy status.
The reverted items are no longer shown as modified.</p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61383728"></a>Rename Items in a Working Copy</h3></div></div></div><a class="indexterm" name="idp61384480"></a><p>You rename an item in a working copy by clicking it a second time
after selecting it in the Working Copy View. The item will change to
edit mode and you can modify its name. Press <span class="bold"><strong>enter</strong></span> to execute the change or <span class="bold"><strong>escape</strong></span> to cancel it.</p><p>Note that the change is not visible before you reload the
view.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61388560"></a>Rename Items in a Repository</h3></div></div></div><a class="indexterm" name="idp61389312"></a><p>Renaming an item in a repository is as simple as renaming it in
the working copy. It is done by in-place editing its name. Press
<span class="bold"><strong>enter</strong></span> to execute the change or
<span class="bold"><strong>escape</strong></span> to cancel it. The only
difference is that subcommander will ask for a commit message.</p><p>Note that the change is not visible before you reload the
view.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61393424"></a>Move and Copy Items in a Working Copy</h3></div></div></div><a class="indexterm" name="idp61394176"></a><a class="indexterm" name="idp61395520"></a><p>To move items in a working copy select them in the Working Copy
View and drag them to the destination folder in the Working Copy View.
After dropping on the destination folder reload the Working Copy View to
update the status.</p><p>To copy the items instead of moving them hold down the control key
while dropping them.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61398224"></a>Move and Copy Items in a Repository</h3></div></div></div><a class="indexterm" name="idp61398976"></a><a class="indexterm" name="idp61400320"></a><p>Moving and copying in a repository works in the same way as in the
Working Copy View: by drag and drop. The only difference is that you can
only move single items in the repository (which is currently a
limitation of subversion). Since this operation takes place in the
repository subcommander will ask for a commit message after dropping the
item.</p><p>To copy an item instead of moving it hold down the control key
while dropping it.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61403152"></a>Import into the Repository</h3></div></div></div><a class="indexterm" name="idp61403904"></a><p>To import new files and folders into a repository select the
target <span class="bold"><strong>Destination URL</strong></span> in the
Repository View and choose import from the Repos menu. Enter the
<span class="bold"><strong>Source Path</strong></span> to the folder you like to
import. You can browse the file system with <span class="bold"><strong>browse
Filesystem</strong></span>.</p><p>To import a single file you need to add the name it should have in
the repository to the <span class="bold"><strong>Destination
URL</strong></span>.</p><div class="figure"><a name="idp61409296"></a><p class="title"><b>Figure 2.9. subcommander Import to Repository Item</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Import.png" align="middle" alt="subcommander Import to Repository Item"></div></div></div><br class="figure-break"><p>If you select a folder as the source the import will add the files
in the selected folder to the <span class="bold"><strong>Destination
URL</strong></span>. You have to add the folder name to the <span class="bold"><strong>Destination URL</strong></span> if the import should include the
folder itself.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61414416"></a>View File Differences in a Working Copy</h3></div></div></div><a class="indexterm" name="idp61415168"></a><p>You can review the changes you have made to an item by selecting
it in the Working Copy View and choosing <span class="bold"><strong>diff</strong></span> from the context menu.</p><p>In case the item is a file subcommander runs
<span class="emphasis"><em>submerge</em></span> to display the original and the modified
version of the file side by side. In case it its a folder subcommander
will display the modifications as a patch file. Submerge is described in
<a class="xref" href="ch03.html" title="Chapter 3. submerge">Chapter 3, <i>submerge</i></a>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61419616"></a>Commit Changes from a Working Copy</h3></div></div></div><a class="indexterm" name="idp61420368"></a><p>You have several options to select the items you like to commit to
the repository. You can select a working copy bookmark in the Project
Folder View or in the Working Copy View to commit all changes below that
folder. You can also choose them by selecting multiple items in the
Working Copy View.</p><p>After you have selected the item(s) you like to commit, choose
<span class="bold"><strong>commit</strong></span> from the context menu. The
commit dialog opens and you can set the <span class="bold"><strong>Commit
Options</strong></span> and enter a <span class="bold"><strong>Log
Message</strong></span> that describes your changes. The <span class="bold"><strong>Commit Log History</strong></span> keeps your latest commit
messages. Selecting a message from the history appends it to the current
log message.</p><p>Any changes to the commit options have to be done before
triggering <span class="bold"><strong>List Items</strong></span>. Finally,
choosing Commit does transfer everything to the repository.</p><div class="figure"><a name="idp61427328"></a><p class="title"><b>Figure 2.10. subcommander Commit Dialog</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Commit.png" align="middle" alt="subcommander Commit Dialog"></div></div></div><br class="figure-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61430416"></a>Create Folders in a Working Copy or a Repository</h3></div></div></div><a class="indexterm" name="idp61431184"></a><p>To create a new folder in the working copy or the repository
select the parent folder of your new directory in the Repository or
Working Copy View. You may need to toggle recursive and view all to
navigate to the parent folder (see the sidebar in <a class="xref" href="ch02s01.html#sc_ToolBar" title="Tool Bar">the section called “Tool Bar”</a>). Then choose <span class="bold"><strong>mkdir</strong></span> from the context menu and enter the name of
the new folder.</p><p>If you create a folder in the repository subcommander will ask for
a commit message.</p><div class="figure"><a name="idp61435088"></a><p class="title"><b>Figure 2.11. subcommander Mkdir Dialog</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Mkdir.png" align="middle" alt="subcommander Mkdir Dialog"></div></div></div><br class="figure-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="sc_sec_Properties"></a>Set, Edit and Delete Properties in a Working Copy</h3></div></div></div><a class="indexterm" name="idp61439216"></a><p>Setting, editing or and deleting properties is done from the
properties dialog. You open the dialog by selecting <span class="bold"><strong>properties</strong></span> from the context menu in the working
copy view.</p><p>On its left side the dialog lists the current <span class="bold"><strong>Properties</strong></span> of the item. By selecting a property
from the list its value gets displayed in the <span class="bold"><strong>Property Value</strong></span> field on the right side.</p><div class="figure"><a name="idp61443872"></a><p class="title"><b>Figure 2.12. subcommander Properties Dialog</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Properties.png" align="middle" alt="subcommander Properties Dialog"></div></div></div><br class="figure-break"><p>To change a property value edit the <span class="bold"><strong>Property
Value</strong></span> and press <span class="bold"><strong>Set Property
Value</strong></span> to store its new value.</p><p>To add a new property select or enter its name in the <span class="bold"><strong>New Property</strong></span> field and press <span class="bold"><strong>New</strong></span>. The new property name is added to the
properties list. To actually set the new property enter a value and
press <span class="bold"><strong>Set Property Value</strong></span>.</p><p>If the item on which you add or change the property is a folder
you can select the recursive flag to set the property on all items in
and below the folder.</p><p>You delete a property by pressing <span class="bold"><strong>Delete
Property</strong></span> after selecting it from the properties list.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="sc_sec_ignore"></a>Add Items to the svn:ignore Property</h3></div></div></div><a class="indexterm" name="idp61454480"></a><p>If you have some files in your working copy that are needed or
generated by your build environment and which are not under version
control they are displayed as unknown items in the Working Copy View.
You can hide those items in the Working Copy View by
<span class="emphasis"><em>ignoring</em></span> them.</p><p>Select the items you want to hide and choose <span class="bold"><strong>svn:ignore</strong></span> from the context menu to hide them.
You can select multiple items at any depth. Subcommander adds each item
to its parents svn:ignore property.</p><p>To temporarily unhide the ignored files toggle the <span class="bold"><strong>View Ignore</strong></span> button in the tool bar (see <a class="xref" href="ch02s01.html#sc_ToolBar" title="Tool Bar">the section called “Tool Bar”</a>). To unhide an item permanently remove it from
its parent folders svn:ignore property (see <a class="xref" href="ch02s03.html#sc_sec_Properties" title="Set, Edit and Delete Properties in a Working Copy">the section called “Set, Edit and Delete Properties in a Working Copy”</a>).</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61460896"></a>Create Branches and Tags</h3></div></div></div><a class="indexterm" name="idp61461648"></a><a class="indexterm" name="idp61462992"></a><p>You create a branch or tag by selecting the source folder in the
Repository Folder View and running <span class="bold"><strong>branch</strong></span> or <span class="bold"><strong>tag</strong></span>
from the context menu.</p><p>The Source URL is filled with the selected item. The Destination
URL is filled with the branches URL from the Project if you choose
branch and with the tags URL from the Project if you choose tag. You
only need to enter a <span class="bold"><strong>Branch/Tag Name</strong></span>
for the new branch or tag. If necessary you can specify a <span class="bold"><strong>Revision</strong></span> for the source URL.</p><div class="figure"><a name="idp61468496"></a><p class="title"><b>Figure 2.13. subcommander Copy Dialog</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Copy.png" align="middle" alt="subcommander Copy Dialog"></div></div></div><br class="figure-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61471584"></a>Switch a Working Copy</h3></div></div></div><a class="indexterm" name="idp61472320"></a><p>You switch your working copy to a branch or tag by selecting the
branch or tag in the Repository Folder View and then running <span class="bold"><strong>switch</strong></span> from the context menu. Your working copy
gets switched to the head revision of the branch or tag.</p><p>Subcommander does request a confirmation so you don't switch by
accident.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61475712"></a>View History of Repository Items</h3></div></div></div><a class="indexterm" name="idp61476464"></a><p>To view the history (commit (or log) messages) of an item select
the item either in the Project Folder View, the Repository View or the
Working Copy View. Then choose <span class="bold"><strong>log</strong></span> from
the context menu to open the log dialog. The log dialog is explained in
<a class="xref" href="ch02s04.html" title="The Log Dialog">the section called “The Log Dialog”</a>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61479936"></a>Merge into a Working Copy</h3></div></div></div><a class="indexterm" name="idp61480688"></a><p>Merging changes into a working copy is done with the Merge Dialog.
Select the <span class="bold"><strong>Merge Source</strong></span> in the project
folder view and choose merge from the context menu to open it. In the
dialog you can select the <span class="bold"><strong>Source
Revisions</strong></span> and the <span class="bold"><strong>Merge
Destination</strong></span> working copy.</p><p>The <span class="emphasis"><em>peg revision</em></span> is only available if you use
a single <span class="bold"><strong>Merge Source</strong></span>. It will be
disabled if you want to merge the differences between two <span class="bold"><strong>Merge Sources</strong></span>, for example two tags, into a
working copy.</p><p>The easiest way to merge a number of known revisions into a
working copy, like merging bugfixes from trunk to a branch, is to open
the log dialog on the <span class="bold"><strong>Merge Source</strong></span>.
Select the revisions you like to merge and choose merge from the context
menu. This will open the Merge Dialog with already filled revisions. You
just need to press Ok in the dialog to make the merge happen. This is
described in more detail in <a class="xref" href="ch02s04.html" title="The Log Dialog">the section called “The Log Dialog”</a>.</p><div class="figure"><a name="idp61489408"></a><p class="title"><b>Figure 2.14. subcommander. Merge Dialog</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Merge.png" align="middle" alt="subcommander. Merge Dialog"></div></div></div><br class="figure-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61492496"></a>Resolve Merge Conflicts in a Working Copy</h3></div></div></div><a class="indexterm" name="idp61493264"></a><a class="indexterm" name="idp61495056"></a><p>If you need to resolve conflicts caused by merging changes into
your working copy select the file in the working copy view. Choose
<span class="bold"><strong>edit conflict</strong></span> from the context menu to
run submerge and resolve the conflicts. See <a class="xref" href="ch03s03.html" title="Merge">the section called “Merge”</a> for a description of merging a file in
submerge. <span class="emphasis"><em>TODO mention the temporary files used to do the
three way merge</em></span>.</p><p>After you have resolved the conflicts you have to tell subversion
that you resolved the conflict. To do that run <span class="bold"><strong>resolved conflicts</strong></span> from the context menu on the
same file.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61500768"></a>View Blame Information</h3></div></div></div><a class="indexterm" name="idp61501504"></a><p>Sometimes if you like to know who or when a line in a file was
changed the last time run <span class="emphasis"><em>blame</em></span> on it. Select the
file in the working copy view and choose <span class="bold"><strong>blame</strong></span> from the Wc menu.</p><p>After running the blame you can see the previously mentioned
information. You can restrict the information to a revision range by
modifying the <span class="bold"><strong>Start Revision</strong></span> or the
<span class="bold"><strong>Stop Revision</strong></span>. If a line was changed
the last time before or after the given range the blame won't list the
revision, date and author info for it. The columns will be empty.</p><div class="figure"><a name="idp61506784"></a><p class="title"><b>Figure 2.15. subcommander. Blame Dialog</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Blame.png" align="middle" alt="subcommander. Blame Dialog"></div></div></div><br class="figure-break"></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61509872"></a>Cleanup a Working Copy</h3></div></div></div><a class="indexterm" name="idp61510608"></a><p>Cleanup cleans up the working copy and removes working copy locks
that have not been removed by previous commands. This usually happens if
a command stoped because of errors.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61512736"></a>Lock and Unlock Files</h3></div></div></div><a class="indexterm" name="idp61513472"></a><a class="indexterm" name="idp61514816"></a><p>To lock working copy items in the repository so no one else can
modify them select the items in the working copy view and run <span class="bold"><strong>lock</strong></span> from the Wc menu.</p><p>In the same way use <span class="bold"><strong>unlock</strong></span> from
the Wc menu to unlock the items again.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="idp61518800"></a>View Differences between Repository URLs</h3></div></div></div><a class="indexterm" name="idp61519568"></a><p>Typically there are two scenarios for running a diff on a
repository. First a diff between two different revision of the same URL.
For example comparing the latest trunk with the trunk as it looked like
a few revisions earlier. Second a diff between two different repository
URLs. For example to view the differences between two tags.</p><div class="simplesect"><div class="titlepage"><div><div><h4 class="title"><a name="idp61521696"></a>Differences between two Revisions of the same Repository
URL</h4></div></div></div><p>To run a diff between two revision of a single repository URL
select the corresponding repository item in the Project Folder View
and select <span class="bold"><strong>diff..</strong></span> from the
ReposFolder menu.</p><div class="figure"><a name="idp61523808"></a><p class="title"><b>Figure 2.16. subcommander Diff Dialog</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Subcommander-Diff.png" align="middle" alt="subcommander Diff Dialog"></div></div></div><br class="figure-break"><p>In the Diff Dialog you can set the two revision you like to
diff. If you are done run <span class="bold"><strong>Preview</strong></span> to
show a list of the modifications between the two revisions. By double
clicking an item from the <span class="bold"><strong>Preview
List</strong></span> you can run submerge to visually display the
differences. Note that running submerge will only work on text files.
By running <span class="bold"><strong>Patch</strong></span> you will see a patch
file of the differences.</p><p>The <span class="bold"><strong>Text Status</strong></span>, <span class="bold"><strong>Property Status</strong></span> and <span class="bold"><strong>Folder/File</strong></span> columns show the type of
modification and if an item is a folder or a file. The two status
columns use the same codes as used in the Working Copy View. The
Folder/File column contains an 'F' if the item is a folder and is
empty if the item is a file.</p><p>You can also run the diff between two revision from the Log
Dialog (<a class="xref" href="ch02s04.html" title="The Log Dialog">the section called “The Log Dialog”</a>). The advantage is that
you don't have to enter the revisions manually. You simply select the
two revision from the revision list and run diff.</p></div><div class="simplesect"><div class="titlepage"><div><div><h4 class="title"><a name="idp61533936"></a>Differences between two different Repository URLs</h4></div></div></div><p>Running a diff between two URLs requires to select the two URLs.
You can either run diff and then select the second URL from the diff
dialog using <span class="bold"><strong>browse Repository</strong></span> or you
can select both URLs in the Project Folder View.</p><p>Select the first source URL normally by left clicking the
repository item. To preselect the second source URL hold down the
<span class="keycap"><strong>CTRL</strong></span> key and right-click the second repository item
to open the context menu. Then select <span class="bold"><strong>diff..</strong></span> to open the diff dialog und run
<span class="bold"><strong>Preview</strong></span> to see the differences
between the two URLs.</p><p>This is a bit unusal but the Project Folder View can't currently
use the typical multi-select option because it interferes with the
normal handling.</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s02.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="ch02s04.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Projects & Bookmarks </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> The Log Dialog</td></tr></table></div></body></html>
|