Sophie

Sophie

distrib > Mageia > 5 > i586 > by-pkgid > 27647990744ebd9cfe32398f37f67e20 > files > 3127

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>revert &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="revno" href="revno-help.html" />
    <link rel="prev" title="resolve" href="resolve-help.html" /> 
  </head>
  <body>
    <div class="related">
      <h3>Navigation</h3>
      <ul>
        <li class="right" style="margin-right: 10px">
          <a href="revno-help.html" title="revno"
             accesskey="N">next</a></li>
        <li class="right" >
          <a href="resolve-help.html" title="resolve"
             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="revert">
<h1>revert<a class="headerlink" href="#revert" title="Permalink to this headline">ΒΆ</a></h1>
<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">Purpose:</th><td class="field-body"><p class="first">Set files in the working tree back to the contents of a previous revision.</p>
</td>
</tr>
<tr class="field-even field"><th class="field-name">Usage:</th><td class="field-body"><p class="first">bzr revert [FILE...]</p>
</td>
</tr>
<tr class="field-odd field"><th class="field-name">Options:</th><td class="field-body"><table class="first docutils option-list" frame="void" rules="none">
<col class="option" />
<col class="description" />
<tbody valign="top">
<tr><td class="option-group">
<kbd><span class="option">-v</span>, <span class="option">--verbose</span></kbd></td>
<td><p class="first last">Display more information.</p>
</td></tr>
<tr><td class="option-group">
<kbd><span class="option">-h</span>, <span class="option">--help</span></kbd></td>
<td><p class="first last">Show help message.</p>
</td></tr>
<tr><td class="option-group">
<kbd><span class="option">-q</span>, <span class="option">--quiet</span></kbd></td>
<td><p class="first last">Only display errors and warnings.</p>
</td></tr>
<tr><td class="option-group" colspan="2">
<kbd><span class="option">--forget-merges</span></kbd></td>
</tr>
<tr><td>&nbsp;</td><td><p class="first last">Remove pending merge marker, without changing any
files.</p>
</td></tr>
<tr><td class="option-group">
<kbd><span class="option">--usage</span></kbd></td>
<td><p class="first last">Show usage message and options.</p>
</td></tr>
<tr><td class="option-group">
<kbd><span class="option">--no-backup</span></kbd></td>
<td><p class="first last">Do not save backups of reverted files.</p>
</td></tr>
<tr><td class="option-group" colspan="2">
<kbd><span class="option">-r <var>ARG</var></span>, <span class="option">--revision=<var>ARG</var></span></kbd></td>
</tr>
<tr><td>&nbsp;</td><td><p class="first last">See &#8220;help revisionspec&#8221; for details.</p>
</td></tr>
</tbody>
</table>
</td>
</tr>
<tr class="field-even field"><th class="field-name">Description:</th><td class="field-body"><p class="first">Giving a list of files will revert only those files.  Otherwise, all files
will be reverted.  If the revision is not specified with &#8216;&#8211;revision&#8217;, the
working tree basis revision is used. A revert operation affects only the
working tree, not any revision history like the branch and repository or
the working tree basis revision.</p>
<p>To remove only some changes, without reverting to a prior version, use
merge instead.  For example, &#8220;merge . -r -2..-3&#8221; (don&#8217;t forget the &#8221;.&#8221;)
will remove the changes introduced by the second last commit (-2), without
affecting the changes introduced by the last commit (-1).  To remove
certain changes on a hunk-by-hunk basis, see the shelve command.
To update the branch to a specific revision or the latest revision and
update the working tree accordingly while preserving local changes, see the
update command.</p>
<p>Uncommitted changes to files that are reverted will be discarded.
Howver, by default, any files that have been manually changed will be
backed up first.  (Files changed only by merge are not backed up.)  Backup
files have &#8216;.~#~&#8217; appended to their name, where # is a number.</p>
<p>When you provide files, you can use their current pathname or the pathname
from the target revision.  So you can use revert to &#8220;undelete&#8221; a file by
name.  If you name a directory, all the contents of that directory will be
reverted.</p>
<p>If you have newly added files since the target revision, they will be
removed.  If the files to be removed have been changed, backups will be
created as above.  Directories containing unknown files will not be
deleted.</p>
<p>The working tree contains a list of revisions that have been merged but
not yet committed. These revisions will be included as additional parents
of the next commit.  Normally, using revert clears that list as well as
reverting the files.  If any files are specified, revert leaves the list
of uncommitted merges alone and reverts only the files.  Use <tt class="docutils literal"><span class="pre">bzr</span> <span class="pre">revert</span>
<span class="pre">.</span></tt> in the tree root to revert all files but keep the recorded merges,
and <tt class="docutils literal"><span class="pre">bzr</span> <span class="pre">revert</span> <span class="pre">--forget-merges</span></tt> to clear the pending merge list without
reverting any files.</p>
<p>Using &#8220;bzr revert &#8211;forget-merges&#8221;, it is possible to apply all of the
changes from a branch in a single revision.  To do this, perform the merge
as desired.  Then doing revert with the &#8220;&#8211;forget-merges&#8221; option will keep
the content of the tree as it was, but it will clear the list of pending
merges.  The next commit will then contain all of the changes that are
present in the other branch, but without any other parent revisions.
Because this technique forgets where these changes originated, it may
cause additional conflicts on later merges involving the same source and
target branches.</p>
</td>
</tr>
<tr class="field-odd field"><th class="field-name">See also:</th><td class="field-body"><p class="first last"><a class="reference internal" href="cat-help.html"><em>cat</em></a>, <a class="reference internal" href="export-help.html"><em>export</em></a>, <a class="reference internal" href="merge-help.html"><em>merge</em></a>, <a class="reference internal" href="shelve-help.html"><em>shelve</em></a></p>
</td>
</tr>
</tbody>
</table>
</div>


          </div>
        </div>
      </div>
      <div class="sphinxsidebar">
        <div class="sphinxsidebarwrapper">
  <h4>Previous topic</h4>
  <p class="topless"><a href="resolve-help.html"
                        title="previous chapter">resolve</a></p>
  <h4>Next topic</h4>
  <p class="topless"><a href="revno-help.html"
                        title="next chapter">revno</a></p>
  <h3>This Page</h3>
  <ul class="this-page-menu">
    <li><a href="../_sources/user-reference/revert-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="revno-help.html" title="revno"
             >next</a></li>
        <li class="right" >
          <a href="resolve-help.html" title="resolve"
             >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>