<!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>diff — Bazaar v2.2.4 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.2.4',
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 v2.2.4 documentation" href="../index.html" />
<link rel="up" title="Bazaar User Reference" href="index.html" />
<link rel="next" title="export" href="export-help.html" />
<link rel="prev" title="deleted" href="deleted-help.html" />
</head>
<body>
<div class="related">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
<a href="export-help.html" title="export"
accesskey="N">next</a></li>
<li class="right" >
<a href="deleted-help.html" title="deleted"
accesskey="P">previous</a> |</li>
<li><a href="http://bazaar.canonical.com/">
<img src="../_static/bzr icon 16.png" /> Home</a> | </li>
<a href="http://doc.bazaar.canonical.com/en/">Documentation</a> | </li>
<li><a href="../index.html">Table of Contents (2.2.4)</a> »</li>
<li><a href="index.html" accesskey="U">Bazaar User Reference</a> »</li>
</ul>
</div>
<div class="document">
<div class="documentwrapper">
<div class="bodywrapper">
<div class="body">
<div class="section" id="diff">
<h1>diff<a class="headerlink" href="#diff" 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"><th class="field-name">Purpose:</th><td class="field-body"><p class="first">Show differences in the working tree, between revisions or branches.</p>
</td>
</tr>
<tr class="field"><th class="field-name">Usage:</th><td class="field-body"><p class="first">bzr diff [FILE...]</p>
</td>
</tr>
<tr class="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">--old=<var>ARG</var></span></kbd></td>
<td><p class="first last">Branch/tree to compare from.</p>
</td></tr>
<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">--format=<var>ARG</var></span></kbd></td>
<td><p class="first last">Diff format to use.</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">-p <var>ARG</var></span>, <span class="option">--prefix=<var>ARG</var></span></kbd></td>
</tr>
<tr><td> </td><td><p class="first last">Set prefixes added to old and new filenames, as two
values separated by a colon. (eg “old/:new/”).</p>
</td></tr>
<tr><td class="option-group">
<kbd><span class="option">--using=<var>ARG</var></span></kbd></td>
<td><p class="first last">Use this command to compare 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">--new=<var>ARG</var></span></kbd></td>
<td><p class="first last">Branch/tree to compare to.</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> </td><td><p class="first last">See “help revisionspec” for details.</p>
</td></tr>
<tr><td class="option-group" colspan="2">
<kbd><span class="option">--diff-options=<var>ARG</var></span></kbd></td>
</tr>
<tr><td> </td><td><p class="first last">Pass these options to the external diff program.</p>
</td></tr>
<tr><td class="option-group" colspan="2">
<kbd><span class="option">-c <var>ARG</var></span>, <span class="option">--change=<var>ARG</var></span></kbd></td>
</tr>
<tr><td> </td><td><p class="first last">Select changes introduced by the specified revision.
See also “help revisionspec”.</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>
</tbody>
</table>
</td>
</tr>
<tr class="field"><th class="field-name">Description:</th><td class="field-body"><p class="first">If no arguments are given, all changes for the current tree are listed.
If files are given, only the changes in those files are listed.
Remote and multiple branches can be compared by using the –old and
–new options. If not provided, the default for both is derived from
the first argument, if any, or the current tree if no arguments are
given.</p>
<p>“bzr diff -p1” is equivalent to “bzr diff –prefix old/:new/”, and
produces patches suitable for “patch -p1”.</p>
</td>
</tr>
<tr class="field"><th class="field-name">Exit values:</th><td class="field-body"><p class="first">1 - changed
2 - unrepresentable changes
3 - error
0 - no change</p>
</td>
</tr>
<tr class="field"><th class="field-name">Examples:</th><td class="field-body"><p class="first">Shows the difference in the working tree versus the last commit:</p>
<div class="highlight-python"><pre>bzr diff</pre>
</div>
<p>Difference between the working tree and revision 1:</p>
<div class="highlight-python"><pre>bzr diff -r1</pre>
</div>
<p>Difference between revision 3 and revision 1:</p>
<div class="highlight-python"><pre>bzr diff -r1..3</pre>
</div>
<p>Difference between revision 3 and revision 1 for branch xxx:</p>
<div class="highlight-python"><pre>bzr diff -r1..3 xxx</pre>
</div>
<p>To see the changes introduced in revision X:</p>
<div class="highlight-python"><pre>bzr diff -cX</pre>
</div>
<p>Note that in the case of a merge, the -c option shows the changes
compared to the left hand parent. To see the changes against
another parent, use:</p>
<div class="highlight-python"><pre>bzr diff -r<chosen_parent>..X</pre>
</div>
<p>The changes introduced by revision 2 (equivalent to -r1..2):</p>
<div class="highlight-python"><pre>bzr diff -c2</pre>
</div>
<p>Show just the differences for file NEWS:</p>
<div class="highlight-python"><pre>bzr diff NEWS</pre>
</div>
<p>Show the differences in working tree xxx for file NEWS:</p>
<div class="highlight-python"><pre>bzr diff xxx/NEWS</pre>
</div>
<p>Show the differences from branch xxx to this working tree:</p>
<blockquote>
<div><p>bzr diff –old xxx</p>
</div></blockquote>
<p>Show the differences between two branches for file NEWS:</p>
<div class="highlight-python"><pre>bzr diff --old xxx --new yyy NEWS</pre>
</div>
<p>Same as ‘bzr diff’ but prefix paths with old/ and new/:</p>
<div class="highlight-python"><pre>bzr diff --prefix old/:new/</pre>
</div>
</td>
</tr>
<tr class="field"><th class="field-name">Aliases:</th><td class="field-body"><p class="first">di, dif</p>
</td>
</tr>
<tr class="field"><th class="field-name">See also:</th><td class="field-body"><p class="first last"><a class="reference internal" href="status-help.html"><em>status</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="deleted-help.html"
title="previous chapter">deleted</a></p>
<h4>Next topic</h4>
<p class="topless"><a href="export-help.html"
title="next chapter">export</a></p>
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../_sources/user-reference/diff-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" size="18" />
<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="export-help.html" title="export"
>next</a></li>
<li class="right" >
<a href="deleted-help.html" title="deleted"
>previous</a> |</li>
<li><a href="http://bazaar.canonical.com/">
<img src="../_static/bzr icon 16.png" /> Home</a> | </li>
<a href="http://doc.bazaar.canonical.com/en/">Documentation</a> | </li>
<li><a href="../index.html">Table of Contents (2.2.4)</a> »</li>
<li><a href="index.html" >Bazaar User Reference</a> »</li>
</ul>
</div>
<div class="footer">
© Copyright 2009, Canonical Ltd.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.7.
</div>
</body>
</html>
