aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Fernando J. Pereda <ferdy@ferdyx.org> 2008-05-18 01:37:49 +0000
committerAvatar Fernando J. Pereda <ferdy@ferdyx.org> 2008-05-18 01:37:49 +0000
commit1fc6810a563a9e75ed36b9663d7dff562e0bdd10 (patch)
treeceeb84f820f0b809758058c73586c803bf1112f7
parent8e845fac4477680ae5a7cfa37da78828f7afa3bf (diff)
downloadpaludis-1fc6810a563a9e75ed36b9663d7dff562e0bdd10.tar.gz
paludis-1fc6810a563a9e75ed36b9663d7dff562e0bdd10.tar.xz
FAQ about merger arrows
-rw-r--r--doc/faq/index.html.part1
-rw-r--r--doc/faq/operation.html.part38
2 files changed, 39 insertions, 0 deletions
diff --git a/doc/faq/index.html.part b/doc/faq/index.html.part
index c5bc557..760659f 100644
--- a/doc/faq/index.html.part
+++ b/doc/faq/index.html.part
@@ -40,6 +40,7 @@ functionality. Pestering anyone about these is liable to get you hurt a lot.</p>
<li><a href="operation.html#updatingdepends">Paludis does not update DEPENDs of already installed packages</a></li>
<li><a href="operation.html#updateworldmissesthings">Updating world misses things</a></li>
<li><a href="operation.html#info">Get package information for a bug report</a></li>
+ <li><a href="operation.html#arrows">What do those fancy arrows when merging things mean?</a></li>
</ul>
<h2>Stricter than Portage</h2>
diff --git a/doc/faq/operation.html.part b/doc/faq/operation.html.part
index 3a28ce3..24ed113 100644
--- a/doc/faq/operation.html.part
+++ b/doc/faq/operation.html.part
@@ -39,3 +39,41 @@ an arbitrary global configuration no matter what.)</p>
If it's an installed package, <em>spec</em> can usually just be the qualified package name (for example, <code>paludis
--info sys-apps/paludis</code>). If you're installing a package, you should instead specify an exact package ID
(such as <code>paludis --info =sys-apps/paludis-0.26.0_alpha12::paludis-overlay</code>).</p>
+
+<h2 id="arrows">What do those fancy arrows when merging things mean?</h2>
+
+<p>They tell how each file is merged to root. They consist of three parts:</p>
+
+<ul>
+ <li>The first part talks about what happened to the entry this one is replacing (if any):
+ <dl>
+ <dt><code>&gt;</code></dt>
+ <dd>The entry didn't exist</dd>
+ <dt><code>=</code></dt>
+ <dd>The entry was reused</dd>
+ <dt><code>&lt;</code><dt>
+ <dd>The entry was unlinked</dd>
+ </dl></li>
+ <li>The second part refers to how it was merged:
+ <dl>
+ <dt><code>&gt;</code><dt>
+ <dd>This entry was copied</dd>
+ <dt><code>-</code><dt>
+ <dd>Merged using <code>rename()</code></dd>
+ <dt><code>^</code><dt>
+ <dd>Merged by using <code>rename()</code> on a parent directory</dd>
+ <dt><code>&amp;</code></dt>
+ <dd>Merged as a hardlink</dd>
+ </dl></li>
+ <li>The third part refers to permissions and modes:
+ <dl>
+ <dt><code>&gt;</code></dt>
+ <dd>Nothing done</dd>
+ <dt><code>~</code><dt>
+ <dd>Fixed ownership</dd>
+ <dt><code>*</code><dt>
+ <dd>Added set*id bits</dd>
+ <dt><code>+</code><dt>
+ <dd>Copied xattrs</dd>
+ </dl></li>
+</ul>