/usr/share/doc/fcm/user_guide/annex_quick_ref_tree_conflicts.html is in fcm 2016.12.0-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 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 | <!DOCTYPE html>
<html>
<head>
<title>FCM: User Guide: Annex: Quick Reference: Tree Conflict Resolution</title>
<meta name="author" content="FCM team" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" href="../etc/fcm-icon.png" type="image/png" />
<link rel="shortcut icon" href="../etc/fcm-icon.png" type="image/png" />
<link href="../etc/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen" />
<link href="../etc/fcm.css" rel="stylesheet" media="screen" />
</head>
<body>
<div class="navbar navbar-inverse">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href=".."><span class="fcm-version">FCM</span></a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li><a href="../installation/">Installation</a></li>
<li><a class="active" href="#">User Guide</a></li>
</ul>
</div>
</div>
</div>
<div class="page-header">
<div class="fcm-page-content pull-right well well-sm"></div>
<h1>FCM: User Guide: Annex: Quick Reference: Tree Conflict Resolution</h1>
</div>
<div class="container">
<div class="row">
<div class="col-md-12">
<h2 id="tree:reference:intro">Introduction</h2>
<p>A tree conflict appears in <code>fcm status</code> like this:</p>
<pre>
! C subroutine/hello_sub_dummy.h
> local missing, incoming edit upon merge
</pre>
<p>and can require complex action to solve, based on the situation. Happily,
<code>fcm conflicts</code> automates the resolution of most ordinary tree
conflicts.</p>
<p>This page is intended to give more information about the meaning of the
common tree conflicts, and to give guidance on those that aren't handled
automatically, such as directory tree conflicts.</p>
<p>The list below is ordered by output from <code>fcm status</code>. There
are two choices that the user must make:</p>
<ul>
<li><em>keep local</em>: Choose the local branch or revision version of a
file or directory. Answer <samp>y</samp> in <code>fcm
conflicts</code>.</li>
<li><em>discard local</em>: Choose the merge branch or other revision
version of a file or directory. Answer <samp>n</samp> in <code>fcm
conflicts</code>.</li>
</ul>
<p>For example, if you are merging the trunk into a working copy of a branch,
<em>keep local</em> would refer to <strong>keeping</strong> the changes as
they existed on the branch; <em>discard local</em> would refer to accepting
the trunk changes and <strong>discarding</strong> the branch ones.</p>
<p>In this page, we use the word <em>local</em> for your local working copy,
and <em>external</em> for the outside source you are updating or merging in
from. In the example above, <em>local</em> would mean your working copy of
the branch; <em>external</em> would mean the trunk.</p>
<p>Subversion implements rename as a copy-and-delete operation. This means a
rename can show up as a delete (or <em>missing</em>) in the tree conflict
information.</p>
<p>It's very important to find out if your tree conflict arises from a
rename, but this information has to be dug out of <code>fcm log</code>. A
rename can have occurred locally or externally. An external rename would show
up in <code>fcm status</code> as an addition with history (<samp>A</samp>
with <samp>+</samp>): for example:</p>
<pre>
A + FILENAME
</pre>
<p><code>fcm log -v FILENAME</code> can be used to examine if this is really
just a rename - it will show up as FILENAME (from ORIGINAL_FILENAME).</p>
<p>Local renames that have been committed won't show up in <code>fcm
status</code>. These can still be found using <code>fcm log -v</code> for
each filename, or you can try to remember what happened!</p>
<h2 id="tree:reference:list">Resolution List</h2>
<p>This section contains specific help on different types of tree
conflict.</p>
<p>Find the relevant section below by running <code>fcm status</code> and
looking up the information below the file in conflict - e.g.:</p>
<pre>
! C subroutine/hello_sub_dummy.h
> local delete, incoming delete upon merge
</pre>
<p>in this case the <samp>local delete, incoming delete upon merge</samp> is
the correct section header.</p>
<p>There are some situations not covered below - <samp>local
obstruction</samp> is not covered here, as it is a case of the user
corrupting the working copy - try a new checkout. Similarly, <samp>local
unversioned</samp> is just a case of a problem with something in the working
copy - an unversioned file or directory exists where Subversion wants to put
the new stuff. Delete or move it, and try the merge again.</p>
<p>If you know that a rename has happened, use the <samp>(renaming)</samp>
suffix for your section below. Otherwise, choose the <samp>(no
renaming)</samp> suffix.</p>
<p><code>fcm resolve</code> always takes the form <code>fcm resolve --accept
working FILENAME</code> for tree conflicts.</p>
<dl>
<dt id="add:add"><samp>local add, incoming add upon merge</samp></dt>
<dd>
<p><dfn>what it means</dfn>: files or directories added with the same
name independently</p>
<p><dfn>what keep local does</dfn>: uses rename to shuffle the old file
to a different name, copies the new file in, renames the new file to the
original name but with a temporary-style suffix (e.g. hello.F90 ->
hello.F90.xD4r), and again renames the old file to the original name.
(Then runs <code>fcm resolve</code>).</p>
<p><dfn>what discarding local does</dfn>: renames the old file to give it
a temporary-style suffix (e.g. hello.F90 -> hello.F90.r6Ys), and
copies the new file into the original name. (Then runs <code>fcm
resolve</code>).</p>
</dd>
<dt id="edit:delete:no_rename"><samp>local edit, incoming delete upon merge
(no renaming)</samp></dt>
<dd>
<p><dfn>meaning</dfn>: file or directory modified on the branch locally,
but deleted on the merge branch</p>
<p><dfn>what keep local does</dfn>: just runs <code>fcm
resolve</code>.</p>
<p><dfn>what discarding local does</dfn>: deletes the file or directory
and runs <code>fcm resolve</code>.</p>
</dd>
<dt id="edit:delete:rename"><samp>local edit, incoming delete upon merge
(renaming)</samp></dt>
<dd>
<p><dfn>meaning</dfn>: file modified on branch locally, but renamed on
merge branch</p>
<p><dfn>what keep local does</dfn>: copies over the renamed file, and the
common ancestor of the file on the branches, and uses them for a text
conflict style merge into the old (local) filename. It then removes the
renamed file and runs <code>fcm resolve</code>.</p>
<p><dfn>what discarding local does</dfn>: copies over the renamed file,
and the common ancestor of the file on the branches, and uses them for a
text conflict style merge into the new renamed file. It then deletes the
old file and runs <code>fcm resolve</code>.</p>
</dd>
<dt id="edit:replace"><samp>local edit, incoming replace upon
merge</samp></dt>
<dd>
<p><dfn>meaning</dfn>: file modified on branch locally, but replaced
(deleted, and new file added) on merge branch</p>
<p><dfn>what keep local does</dfn>: just runs <code>fcm
resolve</code>.</p>
<p><dfn>what discarding local does</dfn>: <code>svn delete</code> local
file, and <code>svn copy</code> the incoming file into it. It then runs
<code>fcm resolve</code>.</p>
</dd>
<dt id="delete:delete:no_rename"><samp>local delete, incoming delete upon
merge (no renaming)</samp></dt>
<dd>
<p><dfn>meaning</dfn>: same filename deleted both locally and
externally.</p>
<p><dfn>in both cases</dfn>: just runs <code>fcm resolve</code>.</p>
</dd>
<dt id="delete:rename:rename"><samp>local delete, incoming delete upon
merge (just external renaming)</samp></dt>
<dd>
<p><dfn>meaning</dfn>: file deleted locally, but renamed externally</p>
<p><dfn>what keep local does</dfn>: just runs <code>fcm
resolve</code>.</p>
<p><dfn>what discarding local does</dfn>: just deletes the new renamed
file and runs <code>fcm resolve</code>.</p>
</dd>
<dt id="rename:delete:rename"><samp>local delete, incoming delete upon
merge (just local renaming)</samp></dt>
<dd>
<p><dfn>meaning</dfn>: file renamed locally, but deleted externally</p>
<p><dfn>what keep local does</dfn>: just runs <code>fcm
resolve</code>.</p>
<p><dfn>what discarding local does</dfn>: deletes the local renamed file
and runs <code>fcm resolve</code>.</p>
</dd>
<dt id="delete:delete:rename"><samp>local delete, incoming delete upon
merge (local renaming AND external renaming)</samp></dt>
<dd>
<p><dfn>meaning</dfn>: same file renamed locally AND externally, to two
different names.</p>
<p><dfn>what keep local does</dfn>: copies in the external file and
common ancestor file to construct a text-style merge using
<code>xxdiff</code> into the locally-renamed filename. Removes the
external rename and runs <code>fcm resolve</code>.</p>
<p><dfn>what discarding local does</dfn>: copies in the external file and
common ancestor file to construct a text-style merge using
<code>xxdiff</code> into the externally-renamed filename. Removes the
local rename and runs <code>fcm resolve</code>.</p>
</dd>
<dt id="missing:edit:no_rename"><samp>local missing, incoming edit upon
merge (no renaming)</samp></dt>
<dd>
<p><dfn>meaning</dfn>: locally deleted file, add newer file from merge
branch?</p>
<p><dfn>what keep local does</dfn>: just runs <code>fcm
resolve</code>.</p>
<p><dfn>what discarding local does</dfn>: copies in the external file
using its URL and runs <code>fcm resolve</code>.</p>
</dd>
<dt id="missing:edit:rename"><samp>local missing, incoming edit upon merge
(renaming)</samp></dt>
<dd>
<p><dfn>meaning</dfn>: locally renamed file, but external changes to the
old filename</p>
<p><dfn>what keep local does</dfn>: copies in the external file and
common ancestor to construct a text-style merge using
<code>xxdiff</code>, into the locally-renamed filename. Runs <code>fcm
resolve</code>.</p>
<p><dfn>what discarding local does</dfn>: copies in the external file and
common ancestor to construct a text-style merge using
<code>xxdiff</code>, into the original filename. Deletes the
locally-renamed file and adds the original filename, then runs <code>fcm
resolve</code>.</p>
</dd>
</dl>
</div>
</div>
</div>
<hr/>
<div class="container-fluid text-center">
<div class="row"><div class="col-md-12">
<address><small>
© British Crown Copyright 2006-16
<a href="http://www.metoffice.gov.uk">Met Office</a>.
See <a href="../etc/fcm-terms-of-use.html">Terms of Use</a>.<br />
This document is released under the British <a href=
"http://www.nationalarchives.gov.uk/doc/open-government-licence/" rel=
"license">Open Government Licence</a>.<br />
</small></address>
</div></div>
</div>
<script type="text/javascript" src="../etc/jquery.min.js"></script>
<script type="text/javascript" src="../etc/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../etc/fcm.js"></script>
<script type="text/javascript" src="../etc/fcm-version.js"></script>
</body>
</html>
|