Sophie

Sophie

distrib > Mageia > 7 > i586 > media > core-release > by-pkgid > 4d3e035d9e975b827326563d291f989a > files > 3158

bzr-2.7.0-6.mga7.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="X-UA-Compatible" content="IE=Edge" />
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>Working offline on a central branch &#8212; Bazaar 2.7.0 documentation</title>
    <link rel="stylesheet" href="../_static/classic.css" type="text/css" />
    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
    
    <script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></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>
    <script type="text/javascript" src="../_static/language_data.js"></script>
    
    <link rel="shortcut icon" href="../_static/bzr.ico"/>
    <link rel="search" title="Search" href="../search.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" role="navigation" aria-label="related navigation">
      <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 class="nav-item nav-item-0"><a href="../index.html">Table of Contents (2.7.0)</a> &#187;</li>

          <li class="nav-item nav-item-1"><a href="index.html" accesskey="U">Bazaar User Guide</a> &#187;</li> 
      </ul>
    </div>  

    <div class="document">
      <div class="documentwrapper">
        <div class="bodywrapper">
          <div class="body" role="main">
            
  <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’re working in a checkout and need/wish to commit locally only,
add the <code class="docutils literal notranslate"><span class="pre">--local</span></code> option to the <code class="docutils literal notranslate"><span class="pre">commit</span></code> command like this:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">bzr</span> <span class="n">commit</span> <span class="o">--</span><span class="n">local</span>
</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 <code class="docutils literal notranslate"><span class="pre">--local</span></code> to every <code class="docutils literal notranslate"><span class="pre">commit</span></code> command
can be annoying. An alternative is to use the <code class="docutils literal notranslate"><span class="pre">unbind</span></code> command to
make the checkout temporarily into a normal branch followed by the
<code class="docutils literal notranslate"><span class="pre">bind</span></code> command at some later point in time when you want to
keep in lockstep again.</p>
<p>Note that the <code class="docutils literal notranslate"><span class="pre">bind</span></code> command remembers where you were bound to
last time this branch was a checkout so it isn’t necessary to enter
the URL of the remote branch when you use <code class="docutils literal notranslate"><span class="pre">bind</span></code> after an earlier
<code class="docutils literal notranslate"><span class="pre">unbind</span></code>.</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 <code class="docutils literal notranslate"><span class="pre">update</span></code>. In this case, <code class="docutils literal notranslate"><span class="pre">update</span></code>
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 <code class="docutils literal notranslate"><span class="pre">status</span></code>.</li>
</ul>
</div></blockquote>
<p>As always, you will need to run <code class="docutils literal notranslate"><span class="pre">commit</span></code> after this to send your
work to the central branch.</p>
</div>
</div>


          </div>
        </div>
      </div>
      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
        <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>
  <div role="note" aria-label="source link">
    <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>
<div id="searchbox" style="display: none" role="search">
  <h3>Quick search</h3>
    <div class="searchformwrapper">
    <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>
    </div>
</div>
<script type="text/javascript">$('#searchbox').show(0);</script>
        </div>
      </div>
      <div class="clearer"></div>
    </div>
    <div class="related" role="navigation" aria-label="related navigation">
      <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 class="nav-item nav-item-0"><a href="../index.html">Table of Contents (2.7.0)</a> &#187;</li>

          <li class="nav-item nav-item-1"><a href="index.html" >Bazaar User Guide</a> &#187;</li> 
      </ul>
    </div>
    <div class="footer" role="contentinfo">
        &#169; Copyright 2009-2011 Canonical Ltd.
      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.4.
    </div>
  </body>
</html>