Use an integer to specify a revision in the history of the branch. Optionally a branch can be specified. The 'revno:' prefix is optional. 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's history, the first revision is returned. Examples:

revno:1                   -> return the first revision
revno:3:/path/to/branch   -> return the 3rd revision of
                             the branch '/path/to/branch'
revno:-1                  -> The last revision in a branch.
-2:http://other/branch    -> The second to last revision in the
                             remote branch.
-1000000                  -> Most likely the first revision, unless
                             your history is very long.

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:

revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'

Supply a positive number to get the nth revision from the end. This is the same as supplying negative numbers to the 'revno:' spec. Examples:

last:1        -> return the last revision
last:3        -> return the revision 2 before the end.

Supply any revision spec to return the parent of that revision. It is an error to request the parent of the null revision (before:0). This is mostly useful when inspecting revisions that are not in the revision history of a branch.

Examples:

before:1913    -> Return the parent of revno 1913 (revno 1912)
before:revid:aaaa@bbbb-1234567890  -> return the parent of revision
                                      aaaa@bbbb-1234567890
bzr diff -r before:revid:aaaa..revid:aaaa
      -> Find the changes between revision 'aaaa' and its parent.
         (what changes did 'aaaa' introduce)

Tags are stored in the branch and created by the 'tag' command.

Supply a datestamp to select the first revision that matches the date. Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string. Matches the first entry after a given date (either at midnight or at a specified time).

One way to display all the changes since yesterday would be:

bzr log -r date:yesterday..-1

Examples:

date:yesterday            -> select the first revision since yesterday
date:2006-08-14,17:10:14  -> select the first revision after
                             August 14th, 2006 at 5:10pm.

Supply the path to a branch to select the common ancestor.

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.

This is frequently used with 'diff' to return all of the changes that your branch introduces, while excluding the changes that you have not merged from the remote branch.

Examples:

ancestor:/path/to/branch
$ bzr diff -r ancestor:../../mainline/branch

Supply the path to a branch to select its last revision.

Examples:

branch:/path/to/branch

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 comands. If no submit branch is specified, the parent branch is used instead.

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.

Examples:

$ bzr diff -r submit:

Add specified files or directories.

bzr add [FILE...]

In non-recursive mode, all the named items are added, regardless of whether they were previously ignored. A warning is given if any of the named files are already versioned.

In recursive mode (the default), files are treated the same way but the behaviour for directories is different. Directories that are already versioned do not give a warning. All directories, whether already versioned or not, are searched for files or subdirectories that are neither versioned or ignored, and these are added. This search proceeds recursively into versioned directories. If no names are given '.' is assumed.

Therefore simply saying 'bzr add' will version all files that are currently unknown.

Adding a file whose parent directory is not versioned will implicitly add the parent, and so on up to the root. This means you should never need to explicitly add a directory, they'll just get added when you add a file in the directory.

--dry-run will show which files would be added, but not actually add them.

--file-ids-from will try to use the file ids from the supplied path. It looks up ids trying to find a matching parent directory with the same filename, and then by pure path. This option is rarely needed but can be useful when adding the same logical file into two branches that will be merged later (without showing the two different adds as a conflict). It is also useful when merging another project into a subdirectory of this one.

remove

Show the origin of each line in a file.

bzr annotate FILENAME

This prints out the given file with an annotation on the left side indicating which revision, author and date introduced the change.

If the origin is the same for a run of consecutive lines, it is shown only at the top, unless the --all option is given.

ann, blame, praise

Convert the current branch into a checkout of the supplied branch.

bzr bind [LOCATION]

Once converted into a checkout, commits must succeed on the master branch before they will be applied to the local branch.

checkouts, unbind

Create a new copy of a branch.

bzr branch FROM_LOCATION [TO_LOCATION]

If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will be used. In other words, "branch ../foo/bar" will attempt to create ./bar. If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION is derived from the FROM_LOCATION by stripping a leading scheme or drive identifier, if any. For example, "branch lp:foo-bar" will attempt to create ./foo-bar.

To retrieve the branch as of a particular revision, supply the --revision parameter, as in "branch foo/bar -r 5".

get, clone

checkout

Break a dead lock on a repository, branch or working directory.

bzr break-lock [LOCATION]

CAUTION: Locks should only be broken when you are sure that the process holding the lock has been stopped.

You can get information on what locks are open via the 'bzr info' command.

bzr break-lock

Write the contents of a file as of a given revision to standard output.

bzr cat FILENAME

If no revision is nominated, the last revision is used.

Note: Take care to redirect standard output when using this command on a binary file.

ls

Validate consistency of branch history.

bzr check [BRANCH]

This command checks various invariants about the branch storage to detect data corruption or bzr bugs.

Output fields:

revisions: This is just the number of revisions checked. It doesn't

indicate a problem.

versionedfiles: This is just the number of versionedfiles checked. It

doesn't indicate a problem.

unreferenced ancestors: Texts that are ancestors of other texts, but

are not properly referenced by the revision ancestry. This is a subtle problem that Bazaar can work around.

unique file texts: This is the total number of unique file contents

seen in the checked revisions. It does not indicate a problem.

repeated file texts: This is the total number of repeated texts seen

in the checked revisions. Texts can be repeated when their file entries are modified, but the file contents are not. It does not indicate a problem.

reconcile

Create a new checkout of an existing branch.

bzr checkout [BRANCH_LOCATION] [TO_LOCATION]

If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for the branch found in '.'. This is useful if you have removed the working tree or if it was never created - i.e. if you pushed the branch to its current location using SFTP.

If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will be used. In other words, "checkout ../foo/bar" will attempt to create ./bar. If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION is derived from the BRANCH_LOCATION by stripping a leading scheme or drive identifier, if any. For example, "checkout lp:foo-bar" will attempt to create ./foo-bar.

To retrieve the branch as of a particular revision, supply the --revision parameter, as in "checkout foo/bar -r 5". Note that this will be immediately out of date [so you cannot commit] but it may be useful (i.e. to examine old code.)

co

branch, checkouts

Commit changes into a new revision.

bzr commit [SELECTED...]

If no arguments are given, the entire tree is committed.

If selected files are specified, only changes to those files are committed. If a directory is specified then the directory and everything within it is committed.

If author of the change is not the same person as the committer, you can specify the author's name using the --author option. The name should be in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".

A selected-file commit may fail in some cases where the committed tree would be invalid. Consider:

bzr init foo
mkdir foo/bar
bzr add foo/bar
bzr commit foo -m "committing foo"
bzr mv foo/bar foo/baz
mkdir foo/bar
bzr add foo/bar
bzr commit foo/bar -m "committing bar but not baz"

In the example above, the last commit will fail by design. This gives the user the opportunity to decide whether they want to commit the rename at the same time, separately first, or not at all. (As a general rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)

Note: A selected-file commit after a merge is not yet supported.

ci, checkin

bugs, uncommit

List files with conflicts.

bzr conflicts

Merge will do its best to combine the changes in two branches, but there are some kinds of problems only a human can fix. When it encounters those, it will mark a conflict. A conflict means that you need to fix something, before you should commit.

Conflicts normally are listed as short, human-readable messages. If --text is supplied, the pathnames of files with text conflicts are listed, instead. (This is useful for editing all files with text conflicts.)

Use bzr resolve when you have fixed a problem.

See also bzr resolve.

List files deleted in the working tree.

bzr deleted

ls, status

Show differences in the working tree or between revisions.

bzr diff [FILE...]

If files are listed, only the changes in those files are listed. Otherwise, all changes for the tree are listed.

"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and produces patches suitable for "patch -p1".

Shows the difference in the working tree versus the last commit:

bzr diff

Difference between the working tree and revision 1:

bzr diff -r1

Difference between revision 2 and revision 1:

bzr diff -r1..2

Same as 'bzr diff' but prefix paths with old/ and new/:

bzr diff --prefix old/:new/

Show the differences between the two working trees:

bzr diff bzr.mine bzr.dev

Show just the differences for 'foo.c':

bzr diff foo.c

1 - changed 2 - unrepresentable changes 3 - error 0 - no change

di, dif

status

Export current or past revision to a destination directory or archive.

bzr export DEST [BRANCH]

If no revision is specified this exports the last committed revision.

Format may be an "exporter" name, such as tar, tgz, tbz2. If none is given, try to find the format with the extension. If no extension is found exports to a directory (equivalent to --format=dir).

If root is supplied, it will be used as the root directory inside container formats (tar, zip, etc). If it is not supplied it will default to the exported filename. The root option has no effect for 'dir' format.

If branch is omitted then the branch containing the current working directory will be used.

Note: Export of tree with non-ASCII filenames to zip is not supported.

Supported formats	Autodetected by extension
dir	(none)
tar	.tar
tbz2	.tar.bz2, .tbz2
tgz	.tar.gz, .tgz
zip	.zip

Show help on a command or other topic.

bzr help [TOPIC]

?, --help, -?, -h

topics

Ignore specified files or patterns.

bzr ignore [NAME_PATTERN...]

To remove patterns from the ignore list, edit the .bzrignore file.

Trailing slashes on patterns are ignored. If the pattern contains a slash or is a regular expression, it is compared to the whole path from the branch root. Otherwise, it is compared to only the last component of the path. To match a file only in the root directory, prepend './'.

Ignore patterns specifying absolute paths are not allowed.

Ignore patterns may include globbing wildcards such as:

? - Matches any single character except '/'
* - Matches 0 or more characters except '/'
/**/ - Matches 0 or more directories in a path
[a-z] - Matches a single character from within a group of characters

Ignore patterns may also be Python regular expressions. Regular expression ignore patterns are identified by a 'RE:' prefix followed by the regular expression. Regular expression ignore patterns may not include named or numbered groups.

Note: ignore patterns containing shell wildcards must be quoted from the shell on Unix.

Ignore the top level Makefile:

bzr ignore ./Makefile

Ignore class files in all directories:

bzr ignore "*.class"

Ignore .o files under the lib directory:

bzr ignore "lib/**/*.o"

Ignore .o files under the lib directory:

bzr ignore "RE:lib/.*\.o"

ignored, status

List ignored files and the patterns that matched them.

bzr ignored

ignore

Show information about a working tree, branch or repository.

bzr info [LOCATION]

This command will show all known locations and formats associated to the tree, branch or repository. Statistical information is included with each report.

Branches and working trees will also report any missing revisions.

repositories, revno, working-trees

Make a directory into a versioned branch.

bzr init [LOCATION]

Branch Format:

--format=ARG	Specify a format for this branch. See "help formats".
--default	New in 0.92: Pack-based format with data compatible with dirstate-tags format repositories. Interoperates with bzr repositories before 0.92 but cannot be read by bzr < 0.92. Previously called knitpack- experimental. For more information, see http://doc .bazaar-vcs.org/latest/developers/packrepo.html.
--dirstate	New in 0.15: Fast local operations. Compatible with bzr 0.8 and above when accessed over the network.
--dirstate-tags
	New in 0.15: Fast local operations and improved scaling for network operations. Additionally adds support for tags. Incompatible with bzr < 0.15.
--knit	Format using knits. Recommended for interoperation with bzr <= 0.14.
--metaweave	Transitional format in 0.8. Slower than knit.
--pack-0.92	New in 0.92: Pack-based format with data compatible with dirstate-tags format repositories. Interoperates with bzr repositories before 0.92 but cannot be read by bzr < 0.92. Previously called knitpack- experimental. For more information, see http://doc .bazaar-vcs.org/latest/developers/packrepo.html.
--rich-root	New in 1.0. Better handling of tree roots. Incompatible with bzr < 1.0
--rich-root-pack
	New in 1.0: Pack-based format with data compatible with rich-root format repositories. Interoperates with bzr repositories before 0.92 but cannot be read by bzr < 1.0. NOTE: This format is experimental. Before using it, please read http://doc.bazaar- vcs.org/latest/developers/packrepo.html.
--weave	Pre-0.8 format. Slower than knit and does not support checkouts or shared repositories.

Use this to create an empty branch, or before importing an existing project.

If there is a repository in a parent directory of the location, then the history of the branch will be stored in the repository. Otherwise init creates a standalone branch which carries its own history in the .bzr directory.

If there is already a branch at the location but it has no working tree, the tree can be populated with 'bzr checkout'.

Recipe for importing a tree of files:

cd ~/project
bzr init
bzr add .
bzr status
bzr commit -m "imported project"

branch, checkout, init-repository

Create a shared repository to hold branches.

bzr init-repository LOCATION

Repository format:

--format=ARG	Specify a format for this repository. See "bzr help formats" for details.
--default	New in 0.92: Pack-based format with data compatible with dirstate-tags format repositories. Interoperates with bzr repositories before 0.92 but cannot be read by bzr < 0.92. Previously called knitpack- experimental. For more information, see http://doc .bazaar-vcs.org/latest/developers/packrepo.html.
--dirstate	New in 0.15: Fast local operations. Compatible with bzr 0.8 and above when accessed over the network.
--dirstate-tags
	New in 0.15: Fast local operations and improved scaling for network operations. Additionally adds support for tags. Incompatible with bzr < 0.15.
--knit	Format using knits. Recommended for interoperation with bzr <= 0.14.
--metaweave	Transitional format in 0.8. Slower than knit.
--pack-0.92	New in 0.92: Pack-based format with data compatible with dirstate-tags format repositories. Interoperates with bzr repositories before 0.92 but cannot be read by bzr < 0.92. Previously called knitpack- experimental. For more information, see http://doc .bazaar-vcs.org/latest/developers/packrepo.html.
--rich-root	New in 1.0. Better handling of tree roots. Incompatible with bzr < 1.0
--rich-root-pack
	New in 1.0: Pack-based format with data compatible with rich-root format repositories. Interoperates with bzr repositories before 0.92 but cannot be read by bzr < 1.0. NOTE: This format is experimental. Before using it, please read http://doc.bazaar- vcs.org/latest/developers/packrepo.html.
--weave	Pre-0.8 format. Slower than knit and does not support checkouts or shared repositories.

New branches created under the repository directory will store their revisions in the repository, not in the branch directory.

If the --no-trees option is used then the branches in the repository will not have working trees by default.

Create a shared repositories holding just branches:

bzr init-repo --no-trees repo
bzr init repo/trunk

Make a lightweight checkout elsewhere:

bzr checkout --lightweight repo/trunk trunk-checkout
cd trunk-checkout
(add files here)

init-repo

branch, checkout, init, repositories

Show log of a branch, file, or directory.

bzr log [LOCATION]

Log format:

--log-format=ARG
	Use specified log format.
--line	Log format with one line per revision
--long	Detailed log format
--short	Moderately short log format

By default show the log of the branch containing the working directory.

To request a range of logs, you can use the command -r begin..end -r revision requests a specific revision, -r ..end or -r begin.. are also valid.

Log the current branch:

bzr log

Log a file:

bzr log foo.c

Log the last 10 revisions of a branch:

bzr log -r -10.. http://server/branch

List files in a tree.

bzr ls [PATH]

cat, status

Perform a three-way merge.

bzr merge [BRANCH]

Merge algorithm:

--merge-type=ARG
	Select a particular merge algorithm.
--diff3	Merge using external diff3
--merge3	Native diff3-style merge
--weave	Weave-based merge

The branch is the branch you will merge from. By default, it will merge the latest revision. If you specify a revision, that revision will be merged. If you specify two revisions, the first will be used as a BASE, and the second one as OTHER. Revision numbers are always relative to the specified branch.

By default, bzr will try to merge in all new work from the other branch, automatically determining an appropriate base. If this fails, you may need to give an explicit base.

Merge will do its best to combine the changes in two branches, but there are some kinds of problems only a human can fix. When it encounters those, it will mark a conflict. A conflict means that you need to fix something, before you should commit.

Use bzr resolve when you have fixed a problem. See also bzr conflicts.

If there is no default branch set, the first merge will set it. After that, you can omit the branch to use the default. To change the default, use --remember. The value will only be saved if the remote location can be accessed.

The results of the merge are placed into the destination working directory, where they can be reviewed (with bzr diff), tested, and then committed to record the result of the merge.

merge refuses to run if there are any uncommitted changes, unless --force is given.

To merge the latest revision from bzr.dev:

bzr merge ../bzr.dev

To merge changes up to and including revision 82 from bzr.dev:

bzr merge -r 82 ../bzr.dev

To merge the changes introduced by 82, without previous changes:

bzr merge -r 81..82 ../bzr.dev

remerge, status-flags, update

Show unmerged/unpulled revisions between two branches.

bzr missing [OTHER_BRANCH]

Log format:

--log-format=ARG
	Use specified log format.
--line	Log format with one line per revision
--long	Detailed log format
--short	Moderately short log format

OTHER_BRANCH may be local or remote.

merge, pull

Create a new versioned directory.

bzr mkdir DIR...

This is equivalent to creating the directory and then adding it.

Move or rename a file.

bzr mv OLDNAME NEWNAME

bzr mv SOURCE... DESTINATION

If the last argument is a versioned directory, all the other names are moved into it. Otherwise, there must be exactly two arguments and the file is changed to a new name.

If OLDNAME does not exist on the filesystem but is versioned and NEWNAME does exist on the filesystem but is not versioned, mv assumes that the file has been manually moved and only updates its internal inventory to reflect that change. The same is valid when moving many SOURCE files to a DESTINATION.

Files cannot be moved between branches.

move, rename

Print or set the branch nickname.

bzr nick [NICKNAME]

If unset, the tree root directory name is used as the nickname To print the current nickname, execute with no argument.

info

Compress the data within a repository.

bzr pack [BRANCH_OR_REPO]

repositories

List the installed plugins.

bzr plugins

This command displays the list of installed plugins including the path where each one is located and a short description of each.

A plugin is an external component for Bazaar that extends the revision control system, by adding or replacing code in Bazaar. Plugins can do a variety of things, including overriding commands, adding new commands, providing additional network transports and customizing log output.

See the Bazaar web site, http://bazaar-vcs.org, for further information on plugins including where to find them and how to install them. Instructions are also provided there on how to write new plugins using the Python programming language.

Turn this branch into a mirror of another branch.

bzr pull [LOCATION]

This command only works on branches that have not diverged. Branches are considered diverged if the destination branch's most recent commit is one that has not been merged (directly or indirectly) into the parent.

If branches have diverged, you can use 'bzr merge' to integrate the changes from one into the other. Once one branch has merged, the other should be able to pull it again.

If you want to forget your local changes and just update your branch to match the remote one, use pull --overwrite.

If there is no default location set, the first pull will set it. After that, you can omit the location to use the default. To change the default, use --remember. The value will only be saved if the remote location can be accessed.

push, status-flags, update

Update a mirror of this branch.