monotone-doc 1.0-3 / usr / share / doc / monotone / html / Conflicts.html

This file is indexed.

/usr/share/doc/monotone/html/Conflicts.html is in monotone-doc 1.0-3.

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
<html lang="en">
<head>
<title>Conflicts - monotone documentation</title>
<meta http-equiv="Content-Type" content="text/html">
<meta name="description" content="monotone documentation">
<meta name="generator" content="makeinfo 4.13">
<link title="Top" rel="start" href="index.html#Top">
<link rel="up" href="Tree.html#Tree" title="Tree">
<link rel="prev" href="Tree.html#Tree" title="Tree">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
  pre.display { font-family:inherit }
  pre.format  { font-family:inherit }
  pre.smalldisplay { font-family:inherit; font-size:smaller }
  pre.smallformat  { font-family:inherit; font-size:smaller }
  pre.smallexample { font-size:smaller }
  pre.smalllisp    { font-size:smaller }
  span.sc    { font-variant:small-caps }
  span.roman { font-family:serif; font-weight:normal; } 
  span.sansserif { font-family:sans-serif; font-weight:normal; } 
--></style>
<link rel="stylesheet" type="text/css" href="texinfo.css">
</head>
<body>
<div class="node">
<a name="Conflicts"></a>
<p>
Previous:&nbsp;<a rel="previous" accesskey="p" href="Tree.html#Tree">Tree</a>,
Up:&nbsp;<a rel="up" accesskey="u" href="Tree.html#Tree">Tree</a>
<hr>
</div>

<h4 class="subsection">4.2.1 Conflicts</h4>

<p>The <samp><span class="command">conflicts</span></samp> set of commands is used to specify conflict
resolutions for merges, asynchronously from the merge command itself. 
This lets the user take as much time as needed to prepare all the
conflict resolutions, and avoids losing work when a merge is aborted
due to a complicated conflict. See <a href="Merge-Conflicts.html#Merge-Conflicts">Merge Conflicts</a>.

<p>These commands require a workspace, to provide a place to store the
conflicts and user resolution files.

<p>For all of these commands, if the <samp><span class="option">--conflicts-file</span></samp> option is
not given, the file <samp><span class="file">_MTN/conflicts</span></samp> is used. If the
<samp><span class="option">--conflicts-file</span></samp> option is given, the file must be in the
bookkeeping directory.

<p>Files given in these commands are relative to the current working
directory, or absolute. In the conflict file, they are relative to the
workspace root, or absolute.

<p>The commands are listed in the order they are typically used, not
in alphabetical order. Then the conflict resolutions are discussed.

<h4 class="subheading">Commands</h4>

     <dl>
<dt><samp><span class="command">mtn conflicts store [--conflicts-file=</span><var>file</var><span class="command">] [</span><var>left_rev_id</var> <var>right_rev_id</var><span class="command">]</span></samp><a name="index-mtn-conflicts-store-_005b_002d_002dconflicts_002dfile_003d_0040var_007bfile_007d_005d-_005b_0040var_007bleft_005frev_005fid_007d-_0040var_007bright_005frev_005fid_007d_005d-54"></a><dd>Store the conflicts encountered by merging <var>left_rev_id</var> with
<var>right_rev_id</var>, in the specified file (defaults to
<samp><span class="file">_MTN/conflicts</span></samp>. If <var>left_rev_id</var> and <var>right_rev_id</var> are
not given, the first two heads that the <samp><span class="command">merge</span></samp> command would
merge are used.

     <p>The conflicts file format is as output by the <samp><span class="command">automate
show_conflicts</span></samp> command; see <samp><span class="command"><a href="mtn-automate-show_005fconflicts.html#mtn-automate-show_005fconflicts">mtn automate show_conflicts</a></span></samp>.

     <p>Content conflicts that can be resolved by the internal line merger
have resolutions, so they will not show up in subsequent
<samp><span class="command">show_first</span></samp> commands.

     <br><dt><samp><span class="command">mtn conflicts show_first [--conflicts-file=</span><var>file</var><span class="command">]</span></samp><a name="index-mtn-conflicts-show_005ffirst-_005b_002d_002dconflicts_002dfile_003d_0040var_007bfile_007d_005d-55"></a><dd>Show the first unresolved conflict in the conflicts file, and list the
possible resolutions.

     <br><dt><samp><span class="command">mtn conflicts show_remaining [--conflicts-file=</span><var>file</var><span class="command">]</span></samp><a name="index-mtn-conflicts-show_005fremaining-_005b_002d_002dconflicts_002dfile_003d_0040var_007bfile_007d_005d-56"></a><dd>Show remaining unresolved conflicts in the conflicts file.

     <br><dt><samp><span class="command">mtn conflicts resolve_first [--conflicts-file=</span><var>file</var><span class="command">] </span><var>resolution</var></samp><a name="index-mtn-conflicts-resolve_005ffirst-_005b_002d_002dconflicts_002dfile_003d_0040var_007bfile_007d_005d-_0040var_007bresolution_007d-57"></a><dd>Specify a resolution for the first conflict in the conflicts file; it
must be a single file conflict. The conflicts file is updated.

     <p><a name="mtn-conflicts-resolve_005ffirst"></a><br><dt><samp><span class="command">mtn conflicts resolve_first_left [--conflicts-file=</span><var>file</var><span class="command">] </span><var>resolution</var></samp><a name="index-mtn-conflicts-resolve_005ffirst_005fleft-_005b_002d_002dconflicts_002dfile_003d_0040var_007bfile_007d_005d-_0040var_007bresolution_007d-58"></a><dt><samp><span class="command">mtn conflicts resolve_first_right [--conflicts-file=</span><var>file</var><span class="command">] </span><var>resolution</var></samp><a name="index-mtn-conflicts-resolve_005ffirst_005fright-_005b_002d_002dconflicts_002dfile_003d_0040var_007bfile_007d_005d-_0040var_007bresolution_007d-59"></a><dd>Specify a resolution for one of the files in the first conflict in the
conflicts file; it must be a two file conflict. The conflicts file is
updated.

     <br><dt><samp><span class="command">mtn conflicts clean</span></samp><a name="index-mtn-conflicts-clean-60"></a><dd>Delete the default conflicts file <samp><span class="file">_MTN/conflicts</span></samp>, and the
directory <samp><span class="file">_MTN/resolutions</span></samp>. Users may store conflict
resolution files in <samp><span class="file">_MTN/resolutions</span></samp>; this command provides a
convenient way to clean up. 
</dl>

<h4 class="subheading">Single file conflict resolutions</h4>

<p>For single file conflicts, there are several possible
resolutions. Note that <samp><span class="command">resolved_user_left</span></samp> is used even for
single file conflicts.

     <dl>
<dt><samp><span class="command">interactive [</span><var>file</var><span class="command">]</span></samp><a name="index-interactive-_005b_0040var_007bfile_007d_005d-61"></a><dd>The Lua <a href="merge3.html#merge3">merge3</a> hook is called to allow the user to manually
merge the left and right files, leaving the result in the specified file.

     <p><var>file</var> must be a bookkeeping path; under <samp><span class="file">_MTN</span></samp>. If not
specified, <var>file</var> defaults to <samp><span class="file">_MTN/resolutions/&lt;path&gt;</span></samp>,
where <samp><span class="file">&lt;path&gt;</span></samp> is the path to the file that has the conflict.

     <p>This inserts a <samp><span class="command">resolved_user_left </span><var>file</var></samp> conflict resolution in the
conflicts file.

     <br><dt><samp><span class="command">user </span><var>file</var></samp><a name="index-user-_0040var_007bfile_007d-62"></a><dd>The file contents are replaced by the contents of the specified file.

     <p>This inserts a <samp><span class="command">resolved_user_left </span><var>file</var></samp> conflict resolution in the
conflicts file.

     <br><dt><samp><span class="command">drop</span></samp><a name="index-drop-63"></a><dd>The file is dropped in the merge. This is useful for an orphaned file
conflict.

     <p>This inserts a <samp><span class="command">resolved_drop_left</span></samp> conflict resolution in the
conflicts file.

     <br><dt><samp><span class="command">rename </span><var>filename</var></samp><a name="index-rename-_0040var_007bfilename_007d-64"></a><dd>The file is renamed. This is useful for an orphaned file conflict.

     <p>This inserts a <samp><span class="command">resolved_rename_left </span><var>filename</var></samp> conflict resolution
in the conflicts file.

</dl>

<h4 class="subheading">Two file conflict resolutions</h4>

<p>For two file conflicts, the possible resolutions are:

     <dl>
<dt><samp><span class="command">drop</span></samp><a name="index-drop-65"></a><dd>The file is dropped in the merge.

     <p>This inserts a <samp><span class="command">resolved_drop_left</span></samp> or <samp><span class="command">resolved_drop_right</span></samp>
conflict resolution in the conflicts file.

     <br><dt><samp><span class="command">keep</span></samp><a name="index-keep-66"></a><dd>The file is kept in the merge.

     <p>This inserts a <samp><span class="command">resolved_keep_left</span></samp> or <samp><span class="command">resolved_keep_right</span></samp>
conflict resolution in the conflicts file.

     <br><dt><samp><span class="command">rename </span><var>filename</var></samp><a name="index-rename-_0040var_007bfilename_007d-67"></a><dd>The file is renamed.

     <p>This inserts a <samp><span class="command">resolved_rename_left </span><var>filename</var></samp> or
<samp><span class="command">resolved_rename_right </span><var>filename</var></samp> conflict resolution in
the conflicts file.

     <br><dt><samp><span class="command">user </span><var>file</var></samp><a name="index-user-_0040var_007bfile_007d-68"></a><dd>The file contents are replaced by the contents of the specified file. 
The other file in the conflict must be dropped or renamed.

     <p>This inserts a <samp><span class="command">resolved_user_left </span><var>file</var></samp> or
<samp><span class="command">resolved_user_right </span><var>file</var></samp> conflict resolution in the
conflicts file.

</dl>

<p>monotone internals note: we don't provide an <code>interactive</code>
resolution for two-file conflicts, because monotone currently does not
provide a <code>merge2</code> Lua hook. two-file conflicts don't have a
shared ancestor, so <code>merge3</code> is not applicable.

</body></html>

APT Browse - Built by Thomas Orozco.