1
<page xmlns="http://projectmallard.org/1.0/"
5
<title type="sort">0</title>
6
<link type="guide" xref="index#vc-mode"/>
9
<title>Viewing version-controlled files</title>
12
<app>Meld</app> integrates with <link xref="vc-supported">many version
13
control systems</link> to let you review local changes and perform
14
simple version control tasks. You can start a new version control
15
comparison by selecting the
16
<guiseq><gui style="menu">File</gui><gui style="menuitem">New...</gui></guiseq>
17
menu item, and clicking on the <gui style="tab">Version Control</gui>
23
<title>Version control comparisons</title>
26
Version control comparisons show the differences between the contents
27
of your folder and the current repository version. Each file in your
28
local copy has a <link xref="#vc-state">state</link> that indicates
29
how it differs from the repository copy.
33
<cite date="2012-06-04" href="mailto:kai.willadsen@gmail.com">Kai</cite>
35
Interacting with VC systems should have its own page.
40
If you want to look at a particular file's differences, you can select
41
it and press <key>Enter</key>, or double-click the file to start a
42
<link xref="file-mode">file comparison</link>. You can also interact
43
with your version control system using the
44
<gui style="menu">Changes</gui> menu.
48
<section id="vc-state">
49
<title>Version control states</title>
52
Each file or folder in a version control comparison has a <em>state</em>,
53
obtained from the version control system itself. <app>Meld</app> maps
54
these different states into a standard set of very similar concepts.
55
As such, <app>Meld</app> might use slightly different names for states
56
than your version control system does. The possible states are:
60
<cite date="2012-06-04" href="mailto:kai.willadsen@gmail.com">Kai</cite>
62
The following table would be much more effective if we could style
63
entries in the Appearance column to show what they would actually
67
Ideally we would pull these colours and other details from the
68
theme/gtkrc, but even an illustration of the default would help a lot.
73
<table frame="top bottom">
74
<title>Version control states</title>
79
<td><p>Appearance</p></td>
80
<td><p>Meaning</p></td>
90
<!-- <file>file.txt</file>-->
95
The file/folder is the same as the repository version.
100
<td><p>Modified</p></td>
104
<!-- <file style="color: #880000; font-weight: bold">file.txt</file>-->
109
This file is different to the repository version.
118
<!-- <file style="color: #008800; font-weight: bold">file.txt</file>-->
123
This file/folder is new, and is scheduled to be added to
129
<td><p>Removed</p></td>
132
Red bold text with a line through the middle
133
<!-- <file style="color: #880000; text-decoration: line-through;">file.txt</file>-->
138
This file/folder existed, but is scheduled to be removed from
144
<td><p>Conflict</p></td>
148
<!-- <file style="color: #ff0000; text-weight: bold;">file.txt</file>-->
153
When trying to merge with the repository, the differences between
154
the local file and the repository could not be resolved, and the
155
file is now in conflict with the repository contents
160
<td><p>Missing</p></td>
163
Blue bold text with a line through the middle
164
<!-- <file style="color: #000088; text-weight: bold; text-decoration: line-through;">file.txt</file>-->
169
This file/folder should be present, but isn't.
174
<td><p>Ignored</p></td>
178
<!-- <file style="color: #888888;">file.txt</file>-->
183
This file/folder has been explicitly ignored (e.g., by an entry
184
in <file>.gitignore</file>) and is not being tracked by version
190
<td><p>Non VC</p></td>
194
<!-- <file style="color: #888888;">file.txt</file>-->
199
This file is not in the version control system; it is only in
205
<td><p>Error</p></td>
208
Bright red with a yellow background and bold
209
<!-- <file style="color: #ff0000; background-color: yellow; font-weight: bold">file.txt</file>-->
214
The version control system has reported a problem with this file.
222
<section id="vc-state-filtering">
223
<title>Version control state filtering</title>
226
Most often, you will only want to see files that are identified as being
227
in some way different; this is the default setting in <app>Meld</app>.
228
You can change which file states you see by using the
229
<guiseq><gui style="menu">View</gui><gui style="menuitem">Version Status</gui></guiseq>
230
menu, or by clicking the corresponding <gui style="button">Modified</gui>,
231
<gui style="button">Normal</gui>, <gui style="button">Non VC</gui> and
232
<gui style="button">Ignored</gui> buttons on the toolbar.