Sophie

Sophie

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

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>Working offline on a central branch &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 Guide" href="index.html" />
    <link rel="next" title="Reusing a checkout" href="reusing_a_checkout.html" />
    <link rel="prev" title="Using checkouts" href="using_checkouts.html" /> 
  </head>
  <body>
    <div class="related">
      <h3>Navigation</h3>
      <ul>
        <li class="right" style="margin-right: 10px">
          <a href="reusing_a_checkout.html" title="Reusing a checkout"
             accesskey="N">next</a></li>
        <li class="right" >
          <a href="using_checkouts.html" title="Using checkouts"
             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 Guide</a> &raquo;</li> 
      </ul>
    </div>  

    <div class="document">
      <div class="documentwrapper">
        <div class="bodywrapper">
          <div class="body">
            
  <div class="section" id="working-offline-on-a-central-branch">
<h1>Working offline on a central branch<a class="headerlink" href="#working-offline-on-a-central-branch" title="Permalink to this headline">¶</a></h1>
<div class="section" id="the-centralized-with-local-commits-workflow">
<h2>The centralized with local commits workflow<a class="headerlink" href="#the-centralized-with-local-commits-workflow" title="Permalink to this headline">¶</a></h2>
<p>If you lose your network connection because you are travelling, the central
server goes down, or you simply want to snapshot changes locally without
publishing them centrally just yet, this workflow is for you.</p>
<img alt="../_images/workflows_localcommit.png" src="../_images/workflows_localcommit.png" />
</div>
<div class="section" id="committing-locally">
<h2>Committing locally<a class="headerlink" href="#committing-locally" title="Permalink to this headline">¶</a></h2>
<p>If you&#8217;re working in a checkout and need/wish to commit locally only,
add the <tt class="docutils literal"><span class="pre">--local</span></tt> option to the <tt class="docutils literal"><span class="pre">commit</span></tt> command like this:</p>
<div class="highlight-python"><div class="highlight"><pre>bzr commit --local
</pre></div>
</div>
</div>
<div class="section" id="being-disconnected-for-long-time-periods">
<h2>Being disconnected for long time periods<a class="headerlink" href="#being-disconnected-for-long-time-periods" title="Permalink to this headline">¶</a></h2>
<p>If you will be or want to be disconnected from the bound branch for
a while, then remembering to add <tt class="docutils literal"><span class="pre">--local</span></tt> to every <tt class="docutils literal"><span class="pre">commit</span></tt> command
can be annoying. An alternative is to use the <tt class="docutils literal"><span class="pre">unbind</span></tt> command to
make the checkout temporarily into a normal branch followed by the
<tt class="docutils literal"><span class="pre">bind</span></tt> command at some later point in time when you want to
keep in lockstep again.</p>
<p>Note that the <tt class="docutils literal"><span class="pre">bind</span></tt> command remembers where you were bound to
last time this branch was a checkout so it isn&#8217;t necessary to enter
the URL of the remote branch when you use <tt class="docutils literal"><span class="pre">bind</span></tt> after an earlier
<tt class="docutils literal"><span class="pre">unbind</span></tt>.</p>
</div>
<div class="section" id="merging-a-series-of-local-commits">
<h2>Merging a series of local commits<a class="headerlink" href="#merging-a-series-of-local-commits" title="Permalink to this headline">¶</a></h2>
<p>When you make commits locally independent of ongoing development
on a central branch, then Bazaar treats these as two lines of
development next time you <tt class="docutils literal"><span class="pre">update</span></tt>. In this case, <tt class="docutils literal"><span class="pre">update</span></tt>
does the following:</p>
<blockquote>
<div><ul class="simple">
<li>it brings the latest revisions from the bound branch down and
makes that the mainline of development within your checkout</li>
<li>it moves your local changes since you last updated into a logical
parallel branch</li>
<li>it merges these together so that your local changes are reported
as a pending merge by <tt class="docutils literal"><span class="pre">status</span></tt>.</li>
</ul>
</div></blockquote>
<p>As always, you will need to run <tt class="docutils literal"><span class="pre">commit</span></tt> after this to send your
work to the central branch.</p>
</div>
</div>


          </div>
        </div>
      </div>
      <div class="sphinxsidebar">
        <div class="sphinxsidebarwrapper">
  <h3><a href="../index.html">Table Of Contents</a></h3>
  <ul>
<li><a class="reference internal" href="#">Working offline on a central branch</a><ul>
<li><a class="reference internal" href="#the-centralized-with-local-commits-workflow">The centralized with local commits workflow</a></li>
<li><a class="reference internal" href="#committing-locally">Committing locally</a></li>
<li><a class="reference internal" href="#being-disconnected-for-long-time-periods">Being disconnected for long time periods</a></li>
<li><a class="reference internal" href="#merging-a-series-of-local-commits">Merging a series of local commits</a></li>
</ul>
</li>
</ul>

  <h4>Previous topic</h4>
  <p class="topless"><a href="using_checkouts.html"
                        title="previous chapter">Using checkouts</a></p>
  <h4>Next topic</h4>
  <p class="topless"><a href="reusing_a_checkout.html"
                        title="next chapter">Reusing a checkout</a></p>
  <h3>This Page</h3>
  <ul class="this-page-menu">
    <li><a href="../_sources/user-guide/working_offline_central.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="reusing_a_checkout.html" title="Reusing a checkout"
             >next</a></li>
        <li class="right" >
          <a href="using_checkouts.html" title="Using checkouts"
             >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 Guide</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>