Sophie

Sophie

distrib > Mageia > 6 > x86_64 > media > core-updates > by-pkgid > e8fe8188cee5592550f08a19b470186d > files > 122

subversion-doc-1.9.7-1.mga6.x86_64.rpm

<?xml version="1.0" encoding="utf-8" standalone="no"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>svn mergeinfo</title>
    <link rel="stylesheet" type="text/css" href="styles.css" />
    <meta name="generator" content="DocBook XSL Stylesheets V1.76.1" />
    <style type="text/css">
body { background-image: url('images/draft.png');
       background-repeat: no-repeat;
       background-position: top left;
       /* The following properties make the watermark "fixed" on the page. */
       /* I think that's just a bit too distracting for the reader... */
       /* background-attachment: fixed; */
       /* background-position: center center; */
     }</style>
    <link rel="home" href="index.html" title="Version Control with Subversion [DRAFT]" />
    <link rel="up" href="svn.ref.svn.html" title="svn Reference—Subversion Command-Line Client" />
    <link rel="prev" href="svn.ref.svn.c.merge.html" title="svn merge" />
    <link rel="next" href="svn.ref.svn.c.mkdir.html" title="svn mkdir" />
  </head>
  <body>
    <div xmlns="" id="vcws-version-notice">
      <p>This text is a work in progress—highly subject to
       change—and may not accurately describe any released
       version of the Apache™ Subversion® software.
       Bookmarking or otherwise referring others to this page is
       probably not such a smart idea.  Please visit
       <a href="http://www.svnbook.com/">http://www.svnbook.com/</a>
       for stable versions of this book.</p>
    </div>
    <div class="navheader">
      <table width="100%" summary="Navigation header">
        <tr>
          <th colspan="3" align="center">svn mergeinfo</th>
        </tr>
        <tr>
          <td width="20%" align="left"><a accesskey="p" href="svn.ref.svn.c.merge.html">Prev</a> </td>
          <th width="60%" align="center">svn Reference—Subversion Command-Line Client</th>
          <td width="20%" align="right"> <a accesskey="n" href="svn.ref.svn.c.mkdir.html">Next</a></td>
        </tr>
      </table>
      <hr />
    </div>
    <div class="refentry" title="svn mergeinfo">
      <a id="svn.ref.svn.c.mergeinfo"></a>
      <div class="titlepage"></div>
      <a id="idp20696384" class="indexterm"></a>
      <div class="refnamediv">
        <h2>Name</h2>
        <p>svn mergeinfo — Query merge-related information.  See <a class="xref" href="svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.mergeinfo" title="Mergeinfo and Previews">the section called “Mergeinfo and Previews”</a> for
        details.</p>
      </div>
      <div class="refsynopsisdiv" title="Synopsis">
        <h2>Synopsis</h2>
        <p>
          <code class="literal">svn mergeinfo SOURCE_URL[@REV] [TARGET[@REV]]</code>
        </p>
      </div>
      <div class="refsect1" title="Description">
        <a id="idp20701808"></a>
        <h2>Description</h2>
        <p>Query information related to merges (or potential
        merges) between <em class="replaceable"><code>SOURCE-URL</code></em> and
        <em class="replaceable"><code>TARGET</code></em>.  If
        the <code class="option">--show-revs</code> option is not provided,
        display a graphical representation of revisions which have
        been fully merged from <em class="replaceable"><code>SOURCE-URL</code></em>
        to <em class="replaceable"><code>TARGET</code></em>.  Otherwise, list
        either the <code class="literal">merged</code>
        or <code class="literal">eligible</code> revisions as specified by
        the <code class="option">--show-revs</code> option.</p>
      </div>
      <div class="refsect1" title="Options">
        <a id="idp20707680"></a>
        <h2>Options</h2>
        <div class="informalexample">
          <pre class="screen">
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.depth"><code class="option">--depth</code> <em class="replaceable"><code>ARG</code></em></a>
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.recursive"><code class="option">--recursive</code> (<code class="option">-R</code>)</a>
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.revision"><code class="option">--revision</code> (<code class="option">-r</code>) <em class="replaceable"><code>REV</code></em></a>
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.show_revs"><code class="option">--show-revs</code> <em class="replaceable"><code>ARG</code></em></a>
</pre>
        </div>
      </div>
      <div class="refsect1" title="Examples">
        <a id="idp20712624"></a>
        <h2>Examples</h2>
        <p>Graphical summary of the merges from one branch to
        another:</p>
        <div class="informalexample">
          <pre class="screen">
$ svn mergeinfo ^/trunk feature-branch
    youngest  last               repos.
    common    full     tip of    path of
    ancestor  merge    branch    branch

    11        16       33
    |         |        |
  -------| |------------         trunk
     \         \
      \         \
       --| |------------         feature-branch
                       |
                       33
</pre>
        </div>
        <p>List the operative revisions merged from one branch to
        another:</p>
        <div class="informalexample">
          <pre class="screen">
$ svn mergeinfo ^/trunk feature-branch --show-revs merged
r15
r16
</pre>
        </div>
        <p>List the operative revisions eligible to be merged from
        one branch to another:</p>
        <div class="informalexample">
          <pre class="screen">
$ svn mergeinfo ^/trunk feature-branch --show-revs eligible
r28
r30
</pre>
        </div>
      </div>
    </div>
    <div class="navfooter">
      <hr />
      <table width="100%" summary="Navigation footer">
        <tr>
          <td width="40%" align="left"><a accesskey="p" href="svn.ref.svn.c.merge.html">Prev</a> </td>
          <td width="20%" align="center">
            <a accesskey="u" href="svn.ref.svn.html">Up</a>
          </td>
          <td width="40%" align="right"> <a accesskey="n" href="svn.ref.svn.c.mkdir.html">Next</a></td>
        </tr>
        <tr>
          <td width="40%" align="left" valign="top">svn merge </td>
          <td width="20%" align="center">
            <a accesskey="h" href="index.html">Home</a>
          </td>
          <td width="40%" align="right" valign="top"> svn mkdir</td>
        </tr>
      </table>
    </div>
    <div xmlns="" id="vcws-footer">
      <hr />
      <img src="images/cc-by.png" style="float: right;" />
      <p>You are reading <em>Version Control with Subversion</em> (for
       Subversion 1.8), by Ben Collins-Sussman, Brian W. Fitzpatrick,
       and C. Michael Pilato.</p>
      <p>This work is licensed under
       the <a href="http://creativecommons.org/licenses/by/2.0/">Creative Commons Attribution License v2.0</a>.</p>
      <p>To submit comments, corrections, or other contributions to the
       text, please visit <a href="http://www.svnbook.com/">http://www.svnbook.com/</a>.</p>
    </div>
  </body>
</html>