Remember that subversion doesn't know something about TDEIO, so a working copy must reside in an area where it may reached without any specific protocol, eg "fish://" or such isn't possible.
<prompt>smb://</prompt> or <prompt>fish://</prompt>. &tdesvn; translates some of them if possible (like <prompt>system:/home</prompt>) but it isn't possible over a network.
This operation is always recursive, means, if selecting a folder &tdesvn; always send all changed items below it. When you setup that you want to review all items before commit inside the following dialog all items tdesvn would send are listed. There you may unmark items you don't want to send. In that case &tdesvn; sends all items alone, eg, not recursive. Or you may select items not versioned for add and commit (if them are not marked to be ignored). So you may see if there are newer items you forgot.
This brings you local working copy in sync with the repository. You may setup that &tdesvn; checks on opening a working copy for newer/modified items in repository. This runs in background and you may work meanwhile with &tdesvn;. Or start check with
You may check if there are somewhere in working copy unversioned items. After selecting
<menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Working copy</guisubmenu>
<guimenuitem>Check for unversioned items</guimenuitem>
</menuchoice> a dialog appears where all not versioned items are listed. Hitting ok adds all marked items to working copy, items you don't want versioned you should unmark before.
Mark in konqueror or any other compatible filebrowser items you want to add and drag them to &tdesvn;. You may drop them on folders inside the opened working copy and than &tdesvn; copy the dropped items to it and add the items.
<title>Deleting items from working copy and unversion</title>
<para>
Deleting items is always recursive. Eg., when you delete a folder all subitems will deleted, too. Mark what you want and select "Delete selected items" from general menu. Items will unversioned and removed from disk.
Simple repository browsing may done within &konqi; &krus; or similar filebrowsers: Open a URL with protocol described in <xref linkend="tdesvn-features" xreflabel="Features" /> (the variants starting with "k") and them will display the content. So simple operations like copy, move and delete may work. When appending a query "?rev=<xxx>" the listing comes from a specific revision. Format of revision-query is described in <xref linkend="revision-syntax" />, some more information about TDEIO::ksvn are in <xref linkend="tdesvn-tdeio" />
All work except "Copy" may only done when browsing at revision HEAD.
</para>
<sect2>
<title>Restoring deleted items</title>
<para>
In subversion restoring deleted items is a copy operation of item at specific revision. So when you plan restoring view repository at revision before item was deleted. Select
</menuchoice>. Inside the following dialog the target is always at HEAD revision, the source is at revision you selected for browsing. Fill out the path click "OK" and copy starts. After successfull copy switch browsing back to HEAD revision and the restored item should appear.
</para>
</sect2>
<sect2>
<title>Importing folders</title>
<para>
Due restrictions of subversion itself only folders, not single files, may imported.
<title>Select folder to import with directory-browser</title>
<para>
Mark the folder where you want to import a new folder. Then select
<menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>General</guisubmenu>
<guimenuitem>Import folders into current</guimenuitem>
</menuchoice> and select your wanted folder.
</para>
</sect3>
</sect2>
</sect1>
<sect1 id="operations">
<title>Other Operations</title>
<sect2 id="merging-items">
<title>Merge</title>
<para>
Open repository or working copy, mark item you want to merge and select
<menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>General</guisubmenu>
<guisubmenu>Merge</guisubmenu>
</menuchoice>.
Enter in the following dialog the values wanted. If opend from repository, source 1 and source 2 are filled, when open from within working copy, target is filled with current selected item. The handling of this parameter is a little bit different between using the internal diff of subversion or an external merge-programm like kdiff3. The target must ALWAYS a local folder or file. You may switch between external or internal merge with the checkbox "Use external merge".
</para>
<sect3>
<title>Internal merge</title>
<para>
The meaning is exactly like from within subversions own commandline tool. When source1 and source2 are equal, start and endrevision must different. If sources aren't equal, start-revision is assigned to source1 and end-revision to source2. The target MUST be a working copy otherwise subversion will send an error message.
</para>
<para>
The checkboxes have following meanings:
<variablelist>
<varlistentry>
<term>Recoursive</term>
<listitem><para>
Do all operations recoursive when working with folders.
</para></listitem>
</varlistentry>
<varlistentry>
<term>Handle unrelated as related items</term>
<listitem><para>
If set, unrelated items will be diffed as if they were related. Otherwise subversion will remove one side and add it on other side again.
</para></listitem>
</varlistentry>
<varlistentry>
<term>Force delete on modified/unversioned</term>
<listitem><para>
If not set and merge would require deletion of an modified or unversioned item the subversion merge fails. Otherwise this items will deleted.
</para></listitem>
</varlistentry>
<varlistentry>
<term>Just dry run without modifications.</term>
<listitem><para>
If set, subversions sends only notifications what it would do but doesn't modify the working copy.
</para></listitem>
</varlistentry>
</variablelist>
</para>
</sect3>
<sect3>
<title>Using external program for merge</title>
<para>
See <xref linkend="diffmerge-settings"/> for details how to setup the external merge tool. &kappname; generates the commandline as described there. Before it does following:
</para>
<para>
<orderedlist>
<listitem><para>
Assign start-revision as revision to source 1 and end-revision to source 2. Then checks if them are different (path and/or revision). If yes, its a three-way merge otherwise a simple merge from source to target. If source 2 is left empty it is a simple merge, too.
</para></listitem>
<listitem><para>
Make an export into temporary folder. If a simple merge only source1 at start-revision, otherwise both sources with there revisions. If item is a file and not a folder than get the content at a specific revision.
</para></listitem>
<listitem>
<para>
Generate the call to your external merge program as you setup in Settings. The error output will displayed in log window so you may see whats going wrong (if something is gone wrong).
</para>
</listitem>
</orderedlist>
In difference to internal merge target may a flat folder/file not under sourcecontrol 'cause external tools doesn't care about it.
</para>
<para>
If recoursive isn't set, the export is done as a flat export. Be care: when doing this with working copies externals will NOT exported.
</para>
</sect3>
</sect2>
<sect2 id="op-resolve">
<title>Resolving conflicts</title>
<para>
&kappname; itself hasn't a module for resolving conflicts but you may use external software from within &kappname;. In <xref linkend="extern-resolve-setup"/> is a description how to setup up this application.
</para>
<para>
When marking an item with status set to "conflicted" (you'll see a red cross in listview on such items) you may select
<menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Working copy</guisubmenu>
<guisubmenu>Resolve conflict</guisubmenu>
</menuchoice>.
or from within context menu <menuchoice><guisubmenu>Resolve conflict</guisubmenu></menuchoice> (only on conflicted items)
&kappname; now starts the program you setup (or the default one). After finish this job you should mark item as resolved
(<menuchoice><guimenu>Subversion</guimenu><guisubmenu>Working copy</guisubmenu><guisubmenu>Mark resolved</guisubmenu></menuchoice>) otherwise you will not able to commit your changes.
</para>
</sect2>
</sect1>
<sect1 id="used-properties">
<title>Properties used by &kappname; for configuration</title>
<sect2>
<title>Bugtracker integration</title>
<para>The <ulink url="http://tortoisesvn.tigris.org/">TortoiseSVN project</ulink> designed a nice property system
<ulink url="http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-bugtracker.html"> for integrating bugtracker</ulink> into
subversion GUI. This moment &kappname; doesn't support extra fields in commit box (will follow later) and doesn't understand all but following properties:
</para>
<para>
<table id="bugtracker-properties">
<title>Bugtracker Integration Properties</title>
<tgroup cols="3">
<thead>
<row>
<entry>Property</entry>
<entry>Description</entry>
<entry>Example</entry>
</row>
</thead>
<tbody>
<row>
<entry><prompt>bugtraq:url</prompt></entry>
<entry>Holds the url to bugtracker. It has to contain the <prompt>%BUGID%</prompt> marker.</entry>
<para>Contains one or two regular expressions, separated by a newline.</para>
<para>If only one expression is set, then the bare bug ID's must be matched in the groups of the regex string. If two expressions are set, then the first expression is used to find a string which relates to the bug ID but may contain more than just the bug ID (e.g. "Issue #123" or "resolves issue 123"). The second expression is then used to extract the bare bug ID from the string extracted with the first expression.</para>
<para>Please keep care about not wanted spaces after the regular expression and don't forget the brackets around the number description.</para>
</entry>
<entry>
<para>Single (useable with TRAC):
<programlisting>
#(\d+)
</programlisting>
Now all numbers like <prompt>#190</prompt> will parsed and translated to an url in logoutput.</para>
<para>
Two expressions:
<programlisting>
[Ii]ssue #?(\d+)(,? ?#(\d+))*
(\d+)
</programlisting>
Remember: Keep care of white spaces after the <prompt>(\d+)</prompt>! This is one of the most errors while this expressions doesn't match!
</para>
</entry>
</row>
</tbody>
</tgroup>
</table>
</para>
<para>
On local opened repositories (eg., <prompt>file://</prompt>-Protocoll) and on working copies this properties will searched upward from opened folder until found or the subversion-toplevel is reached. On repositories opened via network (all except <prompt>file://</prompt> protocoll) it is only searched on opened folder itself.
</para>
<para>
Support for multiple sets of this properties may follow later, (eg., in subfolder extra values for other tracker etc.) but in most cases evaluatin single tracker links should be enough.
</para>
</sect2>
</sect1>
<sect1 id="revision-tree">
<title>The revision tree</title>
<para>
The revision tree try display the whole history of an item so user may get a bette feeling about the history of an item. It has to scan the complete log of the repository 'cause it requires some information subversion does not (and I think will not) give. 'Cause this produces a lot of traffic the revisiontree uses always the internal <link linkend="logcache-descr">logcache</link>.
</para>
<sect2>
<title>Requirements</title>
<para>
The revisiontree is generated via <prompt>dot</prompt>. So for a working revisiontree the <prompt>graphviz</prompt> package must installed.
</para>
</sect2>
</sect1>
<sect1 id="logcache-descr">
<title>Internal log cache</title>
<para>&kappname; may use an internal logcache for some operations. Mostly it is used for <link linkend="revision-tree">the revisiontree</link> but when viewing simplified log in offline modus, too. The caches are oranized as sqlite databases stored in <prompt>$HOME/.sqvnqt/logcache</prompt>. Every numbered file is a storage for a different repository.<warning><para>The databases may get large! So you may disable automatic update of logcache in settings.</para></warning>You may simply remove a database, than no cached log will given back for that repository (and no revisiontree!) but when you don't disable automatic filling the cache on next open this repository or an associated working copy of it the cache will refilled again.
</para>
<sect2>
<title>Offline mode</title>
<para>Kdesvn may work without network access, eg., you may switch that no network access is allowed. This may usefull when working without network like on notebooks. In such cases &kappname; always get the logs from the internal cache. At this time (2008-06-23) this log is reduced to base functions due technical reasons, so the cached log may (but not must) differ from real log. Differ means that it will not display all copy operations even <prompt>"Log follows nodechanges"</prompt> is set.</para>
</sect2>
<sect2>
<title>Logcache and revisiontree</title>
<para>
The revisiontree will only use the logcache 'cause otherwise it must get always the logs again. It will NOT refresh the logcache (but this may changed in later releases).
</para>
</sect2>
</sect1>
<sect1 id="overlay-meaning">
<title>Meaning of icon overlays</title>
<para>
Entries may be marked with overlayed icons when not in "normal" state.
This entry is locked. In last column the owner of lock is listed. You may setup if tdesvn should check for locked items in repository, too. But be carefull: depending of the kind of the server this may take a long time!
&kappname;/subversion is able to save passwords. Saving passwords is always a security risk, but may let a graphical frontend more useable.
</para>
<sect2>
<title>Not saving passwords</title>
<para>
Most secure way, but sometimes unhandy with GUIs like &kappname;. In particular the background processes of &kappname; would always ask for a password in case the repository has restricted access for reading operations like update and status. The same for "commit" and so on. So if you not saving passwords you should disable "Check for updates on open working copy" and so on.
Secured password storage used by a lot of kde programs like kmail and konqueror. If you'saving passwords and mostly using tdesvn you should use this. Keep care that the encrypted storage isn't a high-secure storage. Details see kdewallet documentation.
This is not recommended 'cause the passwords are stored as cleartext! Not believing? Take a look into the files in <prompt>~/.subversion/auth/svn.simple</prompt>. You should only use this if you're using frequently other clients than &kappname; like rapidsvn or esvn or the original svn commandline client. If you're using the commandline client mostly for checkouts or updates which doesn't require a password and tdesvn for commit/move/copy you should use kdewallet instead.
You may activate an internal password cache which will hold passwords as long &kappname; is running in memory. So you must not enter a password twice even if you didn't save it in wallet.
</para>
</sect2>
<sect2>
<title>Specialcase svn+ssh</title>
<para>
When using subversion via svn+ssh password storage may done via ssh and ssh-agent. For this you must have ssh access to the remote mashine and repository. When want to store you must using the public key authentication of ssh, not the password authentication. (In fact ssh prefer the public key authentication). For this you must put your pulic ssh-key on the target, eg., the repository system. SSH passwords will never handled by subversion passwords storage or kde-wallet or internal password cache.
</para>
<para>
If you don't want asked for the password of you ssh-key you may use the <prompt>ssh-agent</prompt>, with selecting the menu
<menuchoice><guimenu>
Subversion
</guimenu>
<guimenuitem>Add ssh identities to ssh-agent</guimenuitem></menuchoice>
you may store you ssh-key-password for your current session so no further entering of your password is needed.
The same maybe for "svn+..." but as from kde 3.4, tdesdk has it own small svn-tdeio called "svn+http"etc. So packages are organized that way - or should that "svn+..." comes as an extra package so it may installed if tdesdk hasn't installed it.
These protocols are designed only for repositories, not for working copies. E.g. "ksvn+file:///<path>" must point to the beginning of a repository different to the application itself or KPart.
Working copies may browsed with konqueror.
</para>
<para>
For browsing at a specific revision you may append the query <link linkend="revision-syntax">"?rev=<revision>"</link> to the url.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Context menus</term>
<listitem><para>
&kappname; installs context menues for konqueror. Them may be seen with right mouse click in the browser window (only in standard view, not any KPart) so it is possible to do most used actions direct from within konqueror (or any other filemanagers that read konquerors context menues like krusader). This is done via a call
Every &kde; based application may use these protocols. So it would be possible to retrieve all differences between two revisions with kdiff3 without any deep knowledge.
Let kdiff3 print all differences between two revisions. Note! Using this within tdesvn (diff'ing two revisions) is MUCH faster because the internal mechanisms of subversion are used.
Some subversion operations may used via the commandline, eg., like a standard commandline client but user interaction is made via KDE-UI. The standard syntax is <prompt>tdesvn exec <command> [parameter] <url></prompt>.
If a single revision on a single url is wanted it may be set as a parameter of the url
<programlisting>svn://your-server/path-to-repository/item?rev=<your-rev></programlisting> This will overwrite the option <prompt>-r <rev></prompt>.
</para>
<para>
A revision may given as
a number or one of <prompt>HEAD</prompt> or <prompt>BASE</prompt> or as date format like {YYYY-MM-DD}.
If in following overview as possible parameter <prompt>-r revision</prompt> is given, this revision may set as <prompt><url>?rev=the-revision</prompt>.
<table id="svn-commands-table">
<title>Subversion commands</title>
<tgroup cols="3">
<thead>
<row>
<entry>Command</entry>
<entry>Meaning</entry>
<entry>Accepted options</entry>
</row>
</thead>
<tbody>
<row>
<entry>commit (or ci)</entry>
<entry>commit changes of item to repository</entry>
<entry>Copy item inside working copy or repository. If target isn't given, &kappname; will prompt.</entry>
<entry></entry>
</row>
<row>
<entry>move (or mv, rename)</entry>
<entry>Move/Rename item inside working copy or repository. If target isn't given, &kappname; will prompt.</entry>
<entry></entry>
</row>
<row>
<entry>get</entry>
<entry>Get content of item and save it</entry>
<entry>-r revision -o <outputfile> (output is required!)</entry>
</row>
<row>
<entry>blame (or annotate)</entry>
<entry>annotate file</entry>
<entry>-r startrevision:endrevision</entry>
</row>
<row>
<entry>update</entry>
<entry>Update item in working copy</entry>
<entry>-r revision</entry>
</row>
<row>
<entry>diff</entry>
<entry>Diff two revisions of item or diff two items at specific revision</entry>
<entry>-r startrev:endrev</entry>
</row>
<row>
<entry>info</entry>
<entry>Detailed information about the item</entry>
<entry>-r revision</entry>
</row>
<row>
<entry>checkout (or co)</entry>
<entry>Checkout repository-path into a new working copy path. Target path and source revision will be asked for.</entry>
<entry></entry>
</row>
<row>
<entry>checkoutto (or coto)</entry>
<entry>Checkout repository-path into a new working copy path. The difference of the source path and source revision will be asked for.</entry>
<entry></entry>
</row>
<row>
<entry>export</entry>
<entry>Export repository- or working copy-path into directory. Target path and source revision will be asked for.</entry>
<entry></entry>
</row>
<row>
<entry>exportto</entry>
<entry>Export repository- or working copy-path into directory. Source path and source revision will be asked for.</entry>
<entry></entry>
</row>
<row>
<entry>delete (del, remove, rm)</entry>
<entry>delete url(s) from repository or working copy.</entry>
<entry></entry>
</row>
<row>
<entry>add</entry>
<entry>add url to working copy. url must belong to a working copy (its not an import!)</entry>
<entry></entry>
</row>
<row>
<entry>revert (or undo)</entry>
<entry>undone current changes to working copy. May only used on working copy urls!</entry>
<entry></entry>
</row>
<row>
<entry>checknew (or addnew)</entry>
<entry>check in given url for new, unversioned items and add them to working copy if wanted.</entry>
<entry></entry>
</row>
<row>
<entry>tree</entry>
<entry>displays revision tree of item (only first argument), if url with "?rev=xxx" given, this revision is the peg-revision.</entry>
<entry>-r startrev:endrev</entry>
</row>
<row>
<entry>lock</entry>
<entry>lock url(s), if "-f" is given then existing locks are brocken.</entry>
<entry>-f</entry>
</row>
<row>
<entry>unlock</entry>
<entry>unlock url(s), if "-f" is given then not owned locks are brocken or non
existing locks are ignored.</entry>
<entry>-f</entry>
</row>
<row>
<entry>help</entry>
<entry>displays this page</entry>
<entry></entry>
</row>
</tbody>
</tgroup>
</table>
<table id="parameter-list">
<title>Parameter for subversion commands</title>
<tgroup cols="3">
<thead>
<row>
<entry>Parameter</entry>
<entry>Possible values</entry>
<entry>allowed for</entry>
</row>
</thead>
<tbody>
<row>
<entry>-r</entry>
<entry><prompt>revision</prompt> or <prompt>startrev:endrev</prompt></entry>
<entry>all except commit</entry>
</row>
<row>
<entry>-R</entry>
<entry>(none)</entry>
<entry>all except commit</entry>
</row>
<row>
<entry><prompt>-o</prompt></entry>
<entry><prompt><filename></prompt></entry>
<entry>get</entry>
</row>
<row>
<entry><prompt>-l</prompt></entry>
<entry><prompt><number></prompt></entry>
<entry>log</entry>
</row>
<row>
<entry><prompt>-f</prompt></entry>
<entry><prompt></prompt></entry>
<entry>(un-)lock</entry>
</row>
</tbody>
</tgroup>
</table>
</para>
<sect2>
<title>The "log" command</title>
<para>
Log command displays a dialog containing the log of the given url. With subversion 1.2 or above it accepts a limit e.g. how many entries it has to display.
</para>
<para>
Inside that dialog you may select log entries and get the differences between them.
<para>Beware of order of revision: You want go from HEAD to START for the LAST one. So you must giverevision HEAD as starting point, otherwise you would get
the first 20 entries.</para>
</example>
</para>
</sect2>
<sect2>
<title>The "diff" command</title>
<para>
You get differences between revisions of an item or between to items inside same working copy or repository. When diff'ing revisions of an item that revisions
may gived as <prompt>-r STARTREV:ENDREV</prompt>. When diffing an item inside a working copy without any revisions it prints the diff against repository.
<example>
<title>Print difference against repository, eg. local changes</title>
<entry>When an item isn't in normal subversion state it may get an overlay. (See <xref linkend="overlay-meaning" />)</entry>
</row>
<row>
<entry>Items sortorder is casesensitive</entry>
<entry>If the sortorder in mainwindow is case sensitivie or not, eg., if "a" not equal to "A".</entry>
</row>
<row>
<entry>External display</entry>
<entry>Default view on double-click. If set to <prompt>default</prompt> &kappname; uses standard action assigned with entry.</entry>
</row>
<row>
<entry>Maximum logmessages in history</entry>
<entry>How many logmessages &kappname; should remember.</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</sect1>
<sect1 id="subversion-settings">
<title>Subversion settings</title>
<para>
<informaltable id="subversion-settings-table">
<tgroup cols="2">
<tbody>
<row>
<entry>Start check for updates when open a working copy</entry>
<entry>When open a working copy start a check for updates in background</entry>
</row>
<row>
<entry>Start fill log cache on open</entry>
<entry>If set &kappname; start (re-)filling the logcache when open a repository or working copy if repository url is not assigned local (<programlisting>file://</programlisting>)</entry>
</row>
<row>
<entry>Check if items has svn:needs-lock set</entry>
<entry>Check on working copies if an item has this property set and if yes, displays a special overlayed icon. Setting this may let listings get real slow.</entry>
</row>
<row>
<entry>Get file details while remote listing</entry>
<entry>When checked, tdesvn get more detailed info about file items when making a listing to remote repositories. So you may see remote locks in overview. Be careful: This may let listings REAL slow!</entry>
<entry>When activated, "info" on folders will gain information about all items below, may be real slow.</entry>
</row>
<row>
<entry>Display ignored files</entry>
<entry>Show items marked in subversion for ignore or not.</entry>
</row>
<row>
<entry>Store passwords for remote connections</entry>
<entry>Storing passwords is often a security problem. Subversion stores its passwords into a flat file, eg., passwords in cleartext! So be carefull setting this flag and see next entry, too. This item only says if saving passwords is the default, you may change it for specific realms inside login dialog.</entry>
</row>
<row>
<entry>Store passwords into KDE wallet</entry>
<entry>When saving passwords, the cleartext file from subversion is a security hole. &kappname; is able saving them into encrypted kde wallet instead there (starting with version 0.12.0) and use them. On other hand other subversion clients aren't able reading them so you must enter them if using tools like svn-cmdline or rapidsvn, too. As long as subversion don't encrypt password storage you should think twice about it.</entry>
</row>
<row>
<entry>Use internal password cache</entry>
<entry>When a password isn't stored persistent &kappname; may hold is until &kappname; ends so you may not need enter it again on each operation. This cache is never persistent, eg., it will not saved anywhere.</entry>
<entry>When doing a commit &tdesvn; may make a check what to do. Eg., if unversioned items are below which may added, list items changed and current operation will commit. This cost a depending on tree more or less time.</entry>
<entry>Maximum displayed logs when full log</entry>
<entry>Doing a "Full log" may cost a much, depending on start-revision. You may limit it to a default maximum value. If set to "0" it is unlimited.</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</sect1>
<sect1 id="diffmerge-settings">
<title>Diff & merge</title>
<para>
<variablelist>
<varlistentry>
<term>Diff ignore contenttype</term>
<listitem><para>
Only interesting when diff are made with subversion itself. When set, than subversions diff ignores the content type of entries. Otherwise it will not output
diffs from binaries.
</para></listitem>
</varlistentry>
<varlistentry>
<term>Diff in revisiontree is recursive</term>
<listitem><para>
When set, diffs made from within revisiontree view are made recursive like in all other cases, too. Otherwise only changes belonging to that folderitems are shown. How that is made depends on how you let diffs generate (from subversion itself or from external viewers).
</para></listitem>
</varlistentry>
<varlistentry>
<term>Diff ignores white space changes</term>
<listitem>
<para>
Ignore changes in the amount of white space (option "-b" to diff)
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Diff ignores all white spaces</term>
<listitem>
<para>Ignore all white space (option "-w" to diff)</para>
</listitem>
</varlistentry>
</variablelist>
</para>
<sect2>
<title>Diff display</title>
<para>
Selects which kind of display for diff-content should use. Default is "kompare" If set to "External display"
you must enter a valid program in "External diff display". Only if internal display is used you may see differences in properties.
&kappname; let the external program make the difference. %1 and %2 will replaced with required values (filenames or foldernames). &kappname;
stores content to compare in a temporary environment (when folders do a "export", when single file, does a "cat") when needed and
cleans up after closing external program or closing itself.
</para></listitem>
</varlistentry>
<varlistentry>
<term>Prefer external merge program</term>
<listitem><para>Select if in merge dialog "Use external program" should be checked or not as default.</para></listitem>
</varlistentry>
</variablelist>
</para>
</sect2>
<sect2>
<title>External merge program</title>
<para>
Setup the program and options for using when subversions builtin merge isn't wanted. The default is <prompt>kdiff3 %s1 %s2 %t</prompt>. The order of substitution variables isn't important, and them may there more than once, eg. like <prompt>kdiff3 -o %t %s1 %s2 %t</prompt>. This stuff is only tested with "meld"
and "kdiff3". Think about that external programs mostly doesn't know any about subversion ignore-parameter so them may show lot more than expected.
</para>
<sect3>
<title>Variable substitutions for external merge program</title>
<para>
<variablelist>
<varlistentry>
<term>%s1</term>
<listitem><para>
Substituted with source number one.
</para></listitem>
</varlistentry>
<varlistentry>
<term>%s2</term>
<listitem><para>
Substituted with source number two. If this is empty or this is equal to source one and start and end revision is same, this variable
will skipped. So be carefull setting up commandlines like <prompt>xxdiff --title1 %s1 --title2 %s2 %s1 %s2 %t</prompt>.
</para></listitem>
</varlistentry>
<varlistentry>
<term>%t</term>
<listitem><para>
Substituted with target.
</para></listitem>
</varlistentry>
</variablelist>
</para>
</sect3>
</sect2>
<sect2 id="extern-resolve-setup">
<title>Conflict resolver program</title>
<para>
You may use an external program like <command>kdiff3</command> for resolving conflicts, the default is
<prompt>kdiff3 %o %m %n -o %t</prompt>.
</para>
<sect3>
<title>Variable substitution for externel conflict resolver</title>
<para>
In paranthesis after each description an example how subversion would call the files. This options meaning are designed for kdiff3, 'cause this moment (2008-02-07) this is the only one I know supporting all parameters required for a good conflict resolving.
<variablelist>
<varlistentry>
<term>%o or %l</term>
<listitem><para>
Old (local,left) version. This means the lower revsion number, eg., the start point of conflicted changes. (<prompt>foo.cc.r2</prompt>)
</para></listitem>
</varlistentry>
<varlistentry>
<term>%m or %w</term>
<listitem><para>
Mine (working) version of file, eg., what you had changed against old version. (<prompt>foo.cc.mine</prompt>)
</para></listitem>
</varlistentry>
<varlistentry>
<term>%n or %r</term>
<listitem><para>
New (remote, right) version of file. Eg, version someone other had made. (<prompt>foo.cc.r3</prompt>)
</para></listitem>
</varlistentry>
<varlistentry>
<term>%t</term>
<listitem><para>
Target name, eg., the origin name. For kdiff3 (as an example) this would be name after the <prompt>"-o"</prompt> parameter (= output file). (<prompt>foo.cc</prompt>)
When making operations on a repository via the tdesvn TDEIO protocol from within konqueror (eg., "ksvn+..." protocols) on large operations like moving or copy folders tdesvn would ask for a logmessage for each item. This is a behavior of konqueror.
When this option is set, the TDEIO implementation from tdesvn will not ask for a logmessage but set a standard logmessage. This flags not the operations from
tdesvn action menu for konqueror but only copy/move/mkdir/delete made with konqueror or other filemanagers on a TDEIO-url.
The message tdesvn-tdeio should set on operations from within konqueror when the flag above is set. Default is "Revision made with tdesvn TDEIO."
<listitem><para><action>Refresh</action> the current status of all displayed items. This will list each item asked for to be displayed at current status.
<listitem><para>Displays detailed information about selected item(s)</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>General</guisubmenu>
<guimenuitem>Blame</guimenuitem>
</menuchoice></term>
<listitem><para>Makes an annotated list over all checkins. That may consume time!</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>General</guisubmenu>
<guimenuitem>Blame range</guimenuitem>
</menuchoice></term>
<listitem><para>Annotate a range of commits for a file.</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>General</guisubmenu>
<guimenuitem>Cat head</guimenuitem>
</menuchoice></term>
<listitem><para>Shows the content of the last commited version of that entry. (May be different to working copy version if working on a WC!)</para></listitem>
<listitem><para>Add selected files and/or directories to version control.</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Working copy</guisubmenu>
<guimenuitem>Revert current changes</guimenuitem>
</menuchoice></term>
<listitem><para>Revert changes made in working copy and updates to last updated state.</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Working copy</guisubmenu>
<guimenuitem>Resolve recursive</guimenuitem>
</menuchoice></term>
<listitem><para>Mark conflicted items as not conflicted and removes associated files.</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Working copy</guisubmenu>
<guimenuitem>Merge two revisions</guimenuitem>
</menuchoice></term>
<listitem><para>Merge two revisions of entries into working copy.</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Working copy</guisubmenu>
<guimenuitem>Ignore/Unignore current item</guimenuitem>
</menuchoice></term>
<listitem><para>Edit property of parent directory of current item so that selected item will marked as ignored if not set, otherwise remove it from ignorelist.</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Working copy</guisubmenu>
<guimenuitem>Cleanup</guimenuitem>
</menuchoice></term>
<listitem><para>Clean up the working copy and removes (commit-)locks if any</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Working copy</guisubmenu>
<guimenuitem>Switch repository</guimenuitem>
</menuchoice></term>
<listitem><para>Switch the root of the current working copy. "relocate" This is not supported at this moment.</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Working copy</guisubmenu>
<guimenuitem>Switch to repository</guimenuitem>
</menuchoice></term>
<listitem><para>Opens the repository tree of another working copy.</para></listitem>
</varlistentry>
</variablelist>
</sect3>
<sect3>
<title>Repository</title>
<variablelist>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Repository</guisubmenu>
<guimenuitem>Checkout current repository path</guimenuitem>
</menuchoice></term>
<listitem><para>Create a working copy from the current selected entry if a directory.</para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
<guimenu>Subversion</guimenu>
<guisubmenu>Repository</guisubmenu>
<guimenuitem>Export current repository path</guimenuitem>
</menuchoice></term>
<listitem><para>Create a clean copy on local filesystem from the current selected entry if a directory.</para></listitem>
</varlistentry>
</variablelist>
</sect3>
</sect2>
<sect2>
<title>The <guimenu>Help</guimenu> Menu</title>
<!-- Assuming you have a standard help menu (help, what's this, about -->
The next big thing could that you forgot to give a libsuffix on 64-Bit systems at compile-time. So the part will installed in <prompt>$PREFIX/lib</prompt> instead of <prompt>$PREFIX/lib64</prompt>. So give <prompt>-DLIB_SUFFIX=64</prompt> as paramter to cmake.
</para>
<para>If this does not solve your problem, you may try out on a console:
Revisions may given in same form like to the standard svn - client. That means: number, keyword or date.
</para>
<para>
<variablelist>
<varlistentry>
<term>Number</term>
<listitem><para>
A number greater or equal -1. -1 means "unspecified revision", 0 is the beginning. Normaly these numbers shouldn't used (most operations will fail with that).
</para></listitem>
</varlistentry>
<varlistentry>
<term>Keyword</term>
<listitem><para>
One of
<itemizedlist>
<listitem><para>
HEAD
</para></listitem>
<listitem><para>
BASE
</para></listitem>
<listitem><para>
COMMITED
</para></listitem>
<listitem><para>
PREV
</para></listitem>
<listitem><para>
START
</para></listitem>
<listitem><para>
WORKING
</para></listitem>
</itemizedlist>
</para>
<para>
The keywords are case sensitive! eg, head is not the same like HEAD.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Date</term>
<listitem><para>
Date in form {YYYY-MM-DD}. It must real MM or DD - eg. 2005-1-1 must written as {2005-01-01}.
</para></listitem>
</varlistentry>
</variablelist>
</para>
<para>
Appending a specific revision to an url will always made via "?rev=<revision>.
Bugreports and wishes may send to <email>tdesvn-bugs@alwins-world.de</email>, questions about usage or any other feedback to <email>tdesvn@alwins-world.de</email>.
An overview for the mailinglists for &kappname; you may get in the <ulink url="http://lists.alwins-world.de/mailman/listinfo">mailinglist overview</ulink>.
</para>
</sect1>
<sect1 id="credits-and-license">
<!-- Include credits for the programmers, documentation writers, and
contributors here. The license for your software should then be included below
the credits with a reference to the appropriate license file included in the KDE
<listitem><para>Andreas Richter <email>ar@oszine.de</email> - for qt4 port of svnqt</para>
</listitem>
<listitem><para>Michael Biebl <email>biebl@teco.edu</email> - for a lot of help, ideas, implementation and hints.</para>
</listitem>
<listitem><para>Bram Schoenmakers <email>bramschoenmakers@kde.nl</email> - for kde-specific hints, dutch translation, cleaning up my code.</para>
</listitem>
</itemizedlist>
And tnx to all other translators (I never thought that I get that fast such a lot of translations!) and for all of your positive and negative feedback. It helped a lot.
If you want your own translation for &kappname; and may want help please read on the homepage of &kappname; or ask on <ulink url="mailto:tdesvn-i10n@alwins-world.de"><email>tdesvn-i10n@alwins-world.de</email> mailinglist</ulink>.
&kappname; requires at least cmake 2.4 for building, automake isn't supported. The following steps works with both distribution tarball or tarball from repository. Unpack the archive
or checkout / export a copy from repository and change to the resulting sourcedirectory.
