forked from mirrors/jj
Deployed 449fc42
to prerelease with MkDocs 1.5.3 and mike 2.0.0
This commit is contained in:
parent
d84a722599
commit
42b1b8fe3a
3 changed files with 12 additions and 13 deletions
|
@ -6653,18 +6653,17 @@ implied.</p>
|
|||
| 0
|
||||
0
|
||||
</code></pre></div></p>
|
||||
<p>Each of the target revisions is rebased onto the parents of the root(s) of
|
||||
the target revset (not to be confused with the repo root). The children of
|
||||
the head(s) of the target revset are rebased onto the target revisions.</p>
|
||||
<p>The target revset is the union of the <code>revisions</code> arguments and must satisfy
|
||||
several conditions, otherwise the command will fail.</p>
|
||||
<ol>
|
||||
<li>The heads of the target revset must have either the same children as the
|
||||
other heads or none.</li>
|
||||
<li>The roots of the target revset have the same parents.</li>
|
||||
<li>The parents of all target revisions except the roots must also be
|
||||
parallelized. This means that the target revisions must be connected.</li>
|
||||
</ol>
|
||||
<p>The command effectively says "these revisions are actually independent",
|
||||
meaning that they should no longer be ancestors/descendants of each other.
|
||||
However, revisions outside the set that were previously ancestors of a
|
||||
revision in the set will remain ancestors of it. For example, revision 0
|
||||
above remains an ancestor of both 1 and 2. Similarly,
|
||||
revisions outside the set that were previously descendants of a revision
|
||||
in the set will remain descendants of it. For example, revision 3 above
|
||||
remains a descendant of both 1 and 2.</p>
|
||||
<p>Therefore, <code>jj parallelize '1 | 3'</code> is a no-op. That's because 2, which is
|
||||
not in the target set, was a descendant of 1 before, so it remains a
|
||||
descendant, and it was an ancestor of 3 before, so it remains an ancestor.</p>
|
||||
<p><strong>Usage:</strong> <code>jj parallelize [REVISIONS]...</code></p>
|
||||
<h6 id="arguments_34"><strong>Arguments:</strong><a class="headerlink" href="#arguments_34" title="Permanent link">¶</a></h6>
|
||||
<ul>
|
||||
|
|
File diff suppressed because one or more lines are too long
Binary file not shown.
Loading…
Reference in a new issue