-
Notifications
You must be signed in to change notification settings - Fork 6
/
Copy pathhowto_revision.dita
43 lines (43 loc) · 2.82 KB
/
howto_revision.dita
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
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "topic.dtd">
<topic id="topic_ijb_wr4_kx">
<title>Revision History / Conflict Dialogue</title>
<body>
<p><b>Revision History</b></p>
<p>By right-clicking on a database object or by clicking Edit / Open Revision History <image
href="Images/icons/full/icon16/history.png" id="image_cck_fs4_kx"/> in the Menu bar, you can
open the revision history of the selected database object in order to compare different
versions and to restore a previous version.</p>
<p>The Revision History window is divided into two parts. The left-hand side displays the master
version, i.e. the current version. The right-hand side shows the previous saved versions
("Select Compare Version").</p>
<p>In the lower part there are the usual tabs, e.g. Passport Data Editor and Egyptian Text Editor,
for the database object. Select a past version by left-clicking to compare it to the current
version. You can navigate between the tabs to see the changes made in the respective
versions.</p>
<p>NOTE: The topmost version on the right is the latest one.</p>
<p>To restore a previous version right-click it in the list and apply "Replace current with
Selected Revision".</p>
<p>Close the Revision History window by clicking "Close".</p>
<p><b>Conflict Dialogue</b></p>
<p>If two users work simultaneously on one database object, it is possible that they each
produce different versions of the same database object at the same time. This is indicated by
the icon <image href="Images/icons/full/ovr16/conflicts-small.png" id="image_av1_g24_kx"/> in
the Navigator tree. The conflict dialogue solves the problem by letting you choose the
preferred version.</p>
<p>NOTE: a padlock symbol on a database object's icon in the Navigator Tree shows which texts
other users are currently working on; please try not to work on texts which are already in
use.</p>
<p>The window is divided into two parts: the left-hand side displays the current version; the
right-hand side shows the conflicting versions.</p>
<p>In the lower part there are the usual tabs, e.g. Passport Data Editor and Egyptian Text Editor,
for a database object. Select a conflicting version by left-clicking to compare it to the
current version. You can navigate between the tabs to see the changes made in the respective
versions. </p>
<p>To remove a conflicting version, right-click it in the list and click "Remove Conflicting
Revision".</p>
<p>NOTE: Due to technical reasons it might take several attempts to access the "Remove
Conflicting Revision" button.</p>
<p>Apply your changes by clicking "Save and Close" or reject them by clicking "Cancel".</p>
</body>
</topic>