Sophie

Sophie

distrib > Mageia > 5 > i586 > media > core-updates > by-pkgid > 27647990744ebd9cfe32398f37f67e20 > files > 3128

bzr-2.6.0-11.1.mga5.i586.rpm

<!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>Revision Identifiers &mdash; Bazaar 2.6.0 documentation</title>
    
    <link rel="stylesheet" href="../_static/default.css" type="text/css" />
    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
    
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '../',
        VERSION:     '2.6.0',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '.html',
        HAS_SOURCE:  true
      };
    </script>
    <script type="text/javascript" src="../_static/jquery.js"></script>
    <script type="text/javascript" src="../_static/underscore.js"></script>
    <script type="text/javascript" src="../_static/doctools.js"></script>
    <link rel="shortcut icon" href="../_static/bzr.ico"/>
    <link rel="top" title="Bazaar 2.6.0 documentation" href="../index.html" />
    <link rel="up" title="Bazaar User Reference" href="index.html" />
    <link rel="next" title="Standard Options" href="standard-options-help.html" />
    <link rel="prev" title="Other Storage Formats" href="other-formats-help.html" /> 
  </head>
  <body>
    <div class="related">
      <h3>Navigation</h3>
      <ul>
        <li class="right" style="margin-right: 10px">
          <a href="standard-options-help.html" title="Standard Options"
             accesskey="N">next</a></li>
        <li class="right" >
          <a href="other-formats-help.html" title="Other Storage Formats"
             accesskey="P">previous</a> |</li>
<li><a href="http://bazaar.canonical.com/">
    <img src="../_static/bzr icon 16.png" /> Home</a>&nbsp;|&nbsp;</li>
<a href="http://doc.bazaar.canonical.com/en/">Documentation</a>&nbsp;|&nbsp;</li>

        <li><a href="../index.html">Table of Contents (2.6.0)</a> &raquo;</li>

          <li><a href="index.html" accesskey="U">Bazaar User Reference</a> &raquo;</li> 
      </ul>
    </div>  

    <div class="document">
      <div class="documentwrapper">
        <div class="bodywrapper">
          <div class="body">
            
  <div class="section" id="revision-identifiers">
<h1>Revision Identifiers<a class="headerlink" href="#revision-identifiers" title="Permalink to this headline">ΒΆ</a></h1>
<p>A revision identifier refers to a specific state of a branch&#8217;s history.  It
can be expressed in several ways.  It can begin with a keyword to
unambiguously specify a given lookup type; some examples are &#8216;last:1&#8217;,
&#8216;before:yesterday&#8217; and &#8216;submit:&#8217;.</p>
<p>Alternately, it can be given without a keyword, in which case it will be
checked as a revision number, a tag, a revision id, a date specification, or a
branch specification, in that order.  For example, &#8216;date:today&#8217; could be
written as simply &#8216;today&#8217;, though if you have a tag called &#8216;today&#8217; that will
be found first.</p>
<p>If &#8216;REV1&#8217; and &#8216;REV2&#8217; are revision identifiers, then &#8216;REV1..REV2&#8217; denotes a
revision range. Examples: &#8216;3647..3649&#8217;, &#8216;date:yesterday..-1&#8217; and
&#8216;branch:/path/to/branch1/..branch:/branch2&#8217; (note that there are no quotes or
spaces around the &#8216;..&#8217;).</p>
<p>Ranges are interpreted differently by different commands. To the &#8220;log&#8221; command,
a range is a sequence of log messages, but to the &#8220;diff&#8221; command, the range
denotes a change between revisions (and not a sequence of changes).  In
addition, &#8220;log&#8221; considers a closed range whereas &#8220;diff&#8221; and &#8220;merge&#8221; consider it
to be open-ended, that is, they include one end but not the other.  For example:
&#8220;bzr log -r 3647..3649&#8221; shows the messages of revisions 3647, 3648 and 3649,
while &#8220;bzr diff -r 3647..3649&#8221; includes the changes done in revisions 3648 and
3649, but not 3647.</p>
<p>The keywords used as revision selection methods are the following:</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
<tr class="field-odd field"><th class="field-name">revid:</th><td class="field-body">Selects a revision using the revision id.</td>
</tr>
<tr class="field-even field"><th class="field-name">submit:</th><td class="field-body">Selects a common ancestor with the submit branch.</td>
</tr>
<tr class="field-odd field"><th class="field-name">ancestor:</th><td class="field-body">Selects a common ancestor with a second branch.</td>
</tr>
<tr class="field-even field"><th class="field-name">date:</th><td class="field-body">Selects a revision on the basis of a datestamp.</td>
</tr>
<tr class="field-odd field"><th class="field-name">branch:</th><td class="field-body">Selects the last revision of a specified branch.</td>
</tr>
<tr class="field-even field"><th class="field-name">tag:</th><td class="field-body">Selects a revision identified by a tag name.</td>
</tr>
<tr class="field-odd field"><th class="field-name">revno:</th><td class="field-body">Selects a revision using a number.</td>
</tr>
<tr class="field-even field"><th class="field-name">before:</th><td class="field-body">Selects the parent of the revision specified.</td>
</tr>
<tr class="field-odd field"><th class="field-name">annotate:</th><td class="field-body">Select the revision that last modified the specified line.</td>
</tr>
<tr class="field-even field"><th class="field-name">mainline:</th><td class="field-body">Select mainline revision that merged the specified revision.</td>
</tr>
<tr class="field-odd field"><th class="field-name">last:</th><td class="field-body">Selects the nth revision from the end.</td>
</tr>
</tbody>
</table>
<p>In addition, plugins can provide other keywords.</p>
<p>A detailed description of each keyword is given below.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
<tr class="field-odd field"><th class="field-name">revid:</th><td class="field-body"><p class="first">Supply a specific revision id, that can be used to specify any
revision id in the ancestry of the branch.
Including merges, and pending merges.
Examples:</p>
<div class="highlight-python"><div class="highlight"><pre>revid:aaaa@bbbb-123456789 -&gt; Select revision &#39;aaaa@bbbb-123456789&#39;
</pre></div>
</div>
</td>
</tr>
<tr class="field-even field"><th class="field-name">submit:</th><td class="field-body"><p class="first">Diffing against this shows all the changes that were made in this branch,
and is a good predictor of what merge will do.  The submit branch is
used by the bundle and merge directive commands.  If no submit branch
is specified, the parent branch is used instead.</p>
<p>The common ancestor is the last revision that existed in both
branches. Usually this is the branch point, but it could also be
a revision that was merged.</p>
<p>Examples:</p>
<div class="highlight-python"><div class="highlight"><pre>$ bzr diff -r submit:
</pre></div>
</div>
</td>
</tr>
<tr class="field-odd field"><th class="field-name">ancestor:</th><td class="field-body"><p class="first">Supply the path to a branch to select the common ancestor.</p>
<p>The common ancestor is the last revision that existed in both
branches. Usually this is the branch point, but it could also be
a revision that was merged.</p>
<p>This is frequently used with &#8216;diff&#8217; to return all of the changes
that your branch introduces, while excluding the changes that you
have not merged from the remote branch.</p>
<p>Examples:</p>
<div class="highlight-python"><div class="highlight"><pre>ancestor:/path/to/branch
$ bzr diff -r ancestor:../../mainline/branch
</pre></div>
</div>
</td>
</tr>
<tr class="field-even field"><th class="field-name">date:</th><td class="field-body"><p class="first">Supply a datestamp to select the first revision that matches the date.
Date can be &#8216;yesterday&#8217;, &#8216;today&#8217;, &#8216;tomorrow&#8217; or a YYYY-MM-DD string.
Matches the first entry after a given date (either at midnight or
at a specified time).</p>
<p>One way to display all the changes since yesterday would be:</p>
<div class="highlight-python"><div class="highlight"><pre>bzr log -r date:yesterday..
</pre></div>
</div>
<p>Examples:</p>
<div class="highlight-python"><div class="highlight"><pre>date:yesterday            -&gt; select the first revision since yesterday
date:2006-08-14,17:10:14  -&gt; select the first revision after
                             August 14th, 2006 at 5:10pm.
</pre></div>
</div>
</td>
</tr>
<tr class="field-odd field"><th class="field-name">branch:</th><td class="field-body"><p class="first">Supply the path to a branch to select its last revision.</p>
<p>Examples:</p>
<div class="highlight-python"><div class="highlight"><pre>branch:/path/to/branch
</pre></div>
</div>
</td>
</tr>
<tr class="field-even field"><th class="field-name">tag:</th><td class="field-body"><p class="first">Tags are stored in the branch and created by the &#8216;tag&#8217; command.</p>
</td>
</tr>
<tr class="field-odd field"><th class="field-name">revno:</th><td class="field-body"><p class="first">Use an integer to specify a revision in the history of the branch.
Optionally a branch can be specified.  A negative number will count
from the end of the branch (-1 is the last revision, -2 the previous
one). If the negative number is larger than the branch&#8217;s history, the
first revision is returned.
Examples:</p>
<div class="highlight-python"><div class="highlight"><pre>revno:1                   -&gt; return the first revision of this branch
revno:3:/path/to/branch   -&gt; return the 3rd revision of
                             the branch &#39;/path/to/branch&#39;
revno:-1                  -&gt; The last revision in a branch.
-2:http://other/branch    -&gt; The second to last revision in the
                             remote branch.
-1000000                  -&gt; Most likely the first revision, unless
                             your history is very long.
</pre></div>
</div>
</td>
</tr>
<tr class="field-even field"><th class="field-name">before:</th><td class="field-body"><p class="first">Supply any revision spec to return the parent of that revision.  This is
mostly useful when inspecting revisions that are not in the revision history
of a branch.</p>
<p>It is an error to request the parent of the null revision (before:0).</p>
<p>Examples:</p>
<div class="highlight-python"><div class="highlight"><pre>before:1913    -&gt; Return the parent of revno 1913 (revno 1912)
before:revid:aaaa@bbbb-1234567890  -&gt; return the parent of revision
                                      aaaa@bbbb-1234567890
bzr diff -r before:1913..1913
      -&gt; Find the changes between revision 1913 and its parent (1912).
         (What changes did revision 1913 introduce).
         This is equivalent to:  bzr diff -c 1913
</pre></div>
</div>
</td>
</tr>
<tr class="field-odd field"><th class="field-name">annotate:</th><td class="field-body"><p class="first">Select the revision that last modified the specified line.  Line is
specified as path:number.  Path is a relative path to the file.  Numbers
start at 1, and are relative to the current version, not the last-
committed version of the file.</p>
</td>
</tr>
<tr class="field-even field"><th class="field-name">mainline:</th><td class="field-body"><p class="first">Select the revision that merged the specified revision into mainline.</p>
</td>
</tr>
<tr class="field-odd field"><th class="field-name">last:</th><td class="field-body"><p class="first">Supply a positive number to get the nth revision from the end.
This is the same as supplying negative numbers to the &#8216;revno:&#8217; spec.
Examples:</p>
<div class="last highlight-python"><div class="highlight"><pre>last:1        -&gt; return the last revision
last:3        -&gt; return the revision 2 before the end.
</pre></div>
</div>
</td>
</tr>
</tbody>
</table>
</div>


          </div>
        </div>
      </div>
      <div class="sphinxsidebar">
        <div class="sphinxsidebarwrapper">
  <h4>Previous topic</h4>
  <p class="topless"><a href="other-formats-help.html"
                        title="previous chapter">Other Storage Formats</a></p>
  <h4>Next topic</h4>
  <p class="topless"><a href="standard-options-help.html"
                        title="next chapter">Standard Options</a></p>
  <h3>This Page</h3>
  <ul class="this-page-menu">
    <li><a href="../_sources/user-reference/revisionspec-help.txt"
           rel="nofollow">Show Source</a></li>
  </ul>
<div id="searchbox" style="display: none">
  <h3>Quick search</h3>
    <form class="search" action="../search.html" method="get">
      <input type="text" name="q" />
      <input type="submit" value="Go" />
      <input type="hidden" name="check_keywords" value="yes" />
      <input type="hidden" name="area" value="default" />
    </form>
    <p class="searchtip" style="font-size: 90%">
    Enter search terms or a module, class or function name.
    </p>
</div>
<script type="text/javascript">$('#searchbox').show(0);</script>
        </div>
      </div>
      <div class="clearer"></div>
    </div>
    <div class="related">
      <h3>Navigation</h3>
      <ul>
        <li class="right" style="margin-right: 10px">
          <a href="standard-options-help.html" title="Standard Options"
             >next</a></li>
        <li class="right" >
          <a href="other-formats-help.html" title="Other Storage Formats"
             >previous</a> |</li>
<li><a href="http://bazaar.canonical.com/">
    <img src="../_static/bzr icon 16.png" /> Home</a>&nbsp;|&nbsp;</li>
<a href="http://doc.bazaar.canonical.com/en/">Documentation</a>&nbsp;|&nbsp;</li>

        <li><a href="../index.html">Table of Contents (2.6.0)</a> &raquo;</li>

          <li><a href="index.html" >Bazaar User Reference</a> &raquo;</li> 
      </ul>
    </div>
    <div class="footer">
        &copy; Copyright 2009-2011 Canonical Ltd.
      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
    </div>
  </body>
</html>