bzr(1) Bazaar bzr(1)NAMEbzr - Bazaar next-generation distributed version control
SYNOPSISbzr command [ command_options ]
bzr help
bzr help command
DESCRIPTION
Bazaar (or bzr) is a project of Canonical to develop an open source
distributed version control system that is powerful, friendly, and
scalable. Version control means a system that keeps track of previous
revisions of software source code or similar information and helps peo‐
ple work on it in teams.
COMMAND OVERVIEWbzr add [FILE...]
Add specified files or directories.
bzr alias [NAME]
Set/unset and display aliases.
bzr annotate FILENAME
Show the origin of each line in a file.
bzr bind [LOCATION]
Convert the current branch into a checkout of the supplied
branch.
bzr branch FROM_LOCATION [TO_LOCATION]
Create a new branch that is a copy of an existing branch.
bzr break-lock [LOCATION]
Break a dead lock on a repository, branch or working directory.
bzr cat FILENAME
Write the contents of a file as of a given revision to standard
output.
bzr check [PATH]
Validate working tree structure, branch consistency and reposi‐
tory history.
bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
Create a new checkout of an existing branch.
bzr clean-tree
Remove unwanted files from working tree.
bzr commit [SELECTED...]
Commit changes into a new revision.
bzr conflicts
List files with conflicts.
bzr deleted
List files deleted in the working tree.
bzr diff [FILE...]
Show differences in the working tree, between revisions or
branches.
bzr export DEST [BRANCH_OR_SUBDIR]
Export current or past revision to a destination directory or
archive.
bzr help [TOPIC]
Show help on a command or other topic.
bzr ignore [NAME_PATTERN...]
Ignore specified files or patterns.
bzr ignored
List ignored files and the patterns that matched them.
bzr info [LOCATION]
Show information about a working tree, branch or repository.
bzr init [LOCATION]
Make a directory into a versioned branch.
bzr init-repository LOCATION
Create a shared repository for branches to share storage space.
bzr join TREE
Combine a tree into its containing tree.
bzr log [FILE...]
Show historical log for a branch or subset of a branch.
bzr ls [PATH]
List files in a tree.
bzr merge [LOCATION]
Perform a three-way merge.
bzr missing [OTHER_BRANCH]
Show unmerged/unpulled revisions between two branches.
bzr mkdir DIR...
Create a new versioned directory.
bzr mv [NAMES...]
Move or rename a file.
bzr nick [NICKNAME]
Print or set the branch nickname.
bzr pack [BRANCH_OR_REPO]
Compress the data within a repository.
bzr plugins
List the installed plugins.
bzr pull [LOCATION]
Turn this branch into a mirror of another branch.
bzr push [LOCATION]
Update a mirror of this branch.
bzr reconcile [BRANCH]
Reconcile bzr metadata in a branch.
bzr reconfigure [LOCATION]
Reconfigure the type of a bzr directory.
bzr remerge [FILE...]
Redo a merge.
bzr remove [FILE...]
Remove files or directories.
bzr remove-tree [LOCATION]
Remove the working tree from a given branch/checkout.
bzr renames [DIR]
Show list of renamed files.
bzr resolve [FILE...]
Mark a conflict as resolved.
bzr revert [FILE...]
Revert files to a previous revision.
bzr revno [LOCATION]
Show current revision number.
bzr root [FILENAME]
Show the tree root directory.
bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
Mail or create a merge-directive for submitting changes.
bzr serve
Run the bzr server.
bzr shelve [FILE...]
Temporarily set aside some changes from the current tree.
bzr sign-my-commits [LOCATION] [COMMITTER]
Sign all commits by a given committer.
bzr split TREE
Split a subdirectory of a tree into a separate tree.
bzr status [FILE...]
Display status summary.
bzr switch [TO_LOCATION]
Set the branch of a checkout and update.
bzr tag TAG_NAME
Create, remove or modify a tag naming a revision.
bzr tags
List tags.
bzr testament [BRANCH]
Show testament (signing-form) of a revision.
bzr unbind
Convert the current checkout into a regular branch.
bzr uncommit [LOCATION]
Remove the last committed revision.
bzr unshelve [SHELF_ID]
Restore shelved changes.
bzr update [DIR]
Update a tree to have the latest code committed to its branch.
bzr upgrade [URL]
Upgrade branch storage to current format.
bzr version
Show version of bzr.
bzr version-info [LOCATION]
Show version information about this tree.
bzr view [FILE...]
Manage filtered views.
bzr whoami [NAME]
Show or set bzr user id.
COMMAND REFERENCEbzr--help
Alias for "help", see "bzr help".
bzr -?
Alias for "help", see "bzr help".
bzr-h
Alias for "help", see "bzr help".
bzr ?
Alias for "help", see "bzr help".
bzr add [FILE...]
Options:
--dry-run Show what would be done, but don´t
actually do anything.
--file-ids-from ARG Lookup file ids from this tree.
--help, -h Show help message.
--no-recurse Don´t recursively add the contents of
directories.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: ignore, remove
Add specified files or directories.
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 ver‐
sioned or not, are searched for files or subdirectories that are nei‐
ther 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 cur‐
rently 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 con‐
flict). It is also useful when merging another project into a subdirec‐
tory of this one.
Any files matching patterns in the ignore list will not be added unless
they are explicitly mentioned.
bzr alias [NAME]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--remove Remove the alias.
--usage Show usage message and options.
--verbose, -v Display more information.
Set/unset and display aliases.
Examples:
Show the current aliases:
bzr alias
Show the alias specified for ´ll´:
bzr alias ll
Set an alias for ´ll´:
bzr alias ll="log --line -r-10..-1"
To remove an alias for ´ll´:
bzr alias --remove ll
bzr ann
Alias for "annotate", see "bzr annotate".
bzr annotate FILENAME
Options:
--all Show annotations on all lines.
--help, -h Show help message.
--long Show commit date in annotations.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--show-ids Show internal object ids.
--usage Show usage message and options.
--verbose, -v Display more information.
Aliases: ann, blame, praise
Show the origin of each line in a file.
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.
bzr bind [LOCATION]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: checkouts, unbind
Convert the current branch into a checkout of the supplied branch.
Once converted into a checkout, commits must succeed on the master
branch before they will be applied to the local branch.
Bound branches use the nickname of its master branch unless it is set
locally, in which case binding will update the local nickname to be
that of the master.
bzr blame
Alias for "annotate", see "bzr annotate".
bzr branch FROM_LOCATION [TO_LOCATION]
Options:
--bind Bind new branch to from location.
--hardlink Hard-link working tree files where
possible.
--help, -h Show help message.
--no-tree Create a branch without a working-tree.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--stacked Create a stacked branch referring to the
source branch. The new branch will
depend on the availability of the source
branch for all operations.
--standalone Do not use a shared repository, even if
available.
--switch Switch the checkout in the current
directory to the new branch.
--usage Show usage message and options.
--use-existing-dir By default branch will fail if the
target directory exists, but does not
already have a control directory. This
flag will allow branch to proceed.
--verbose, -v Display more information.
Aliases: get, clone
See also: checkout
Create a new branch that is a copy of an existing branch.
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 cre‐
ate ./bar. If the FROM_LOCATION has no / or path separator embedded,
the TO_LOCATION is derived from the FROM_LOCATION by stripping a lead‐
ing 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 --revi‐
sion parameter, as in "branch foo/bar -r 5".
bzr break-lock [LOCATION]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Break a dead lock on a repository, branch or working directory.
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 [loca‐
tion]´ command.
Examples:
bzr break-lock
bzr break-lock bzr+ssh://example.com/bzr/foo
bzr cat FILENAME
Options:
--filters Apply content filters to display the
convenience form.
--help, -h Show help message.
--name-from-revision The path name in the old tree.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: ls
Write the contents of a file as of a given revision to standard output.
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.
bzr check [PATH]
Options:
--branch Check the branch related to the current
directory.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--repo Check the repository related to the
current directory.
--tree Check the working tree related to the
current directory.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: reconcile
Validate working tree structure, branch consistency and repository his‐
tory.
This command checks various invariants about branch and repository
storage to detect data corruption or bzr bugs.
The working tree and branch checks will only give output if a problem
is detected. The output fields of the repository check are:
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.
If no restrictions are specified, all Bazaar data that is found at the
given location will be checked.
Examples:
Check the tree and branch at ´foo´:
bzr check --tree --branch foo
Check only the repository at ´bar´:
bzr check --repo bar
Check everything at ´baz´:
bzr check baz
bzr checkin
Alias for "commit", see "bzr commit".
bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
Options:
--files-from ARG Get file contents from this tree.
--hardlink Hard-link working tree files where
possible.
--help, -h Show help message.
--lightweight Perform a lightweight checkout.
Lightweight checkouts depend on access
to the branch for every operation.
Normal checkouts can perform common
operations like diff and status without
such access, and also support local
commits.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--usage Show usage message and options.
--verbose, -v Display more information.
Alias: co
See also: branch, checkouts
Create a new checkout of an existing branch.
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_LOCA‐
TION 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 strip‐
ping a leading scheme or drive identifier, if any. For example, "check‐
out lp:foo-bar" will attempt to create ./foo-bar.
To retrieve the branch as of a particular revision, supply the --revi‐
sion 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.)
bzr ci
Alias for "commit", see "bzr commit".
bzr clean-tree
Options:
--detritus Delete conflict files, merge backups,
and failed selftest dirs.
--dry-run Show files to delete instead of deleting
them.
--force Do not prompt before deleting.
--help, -h Show help message.
--ignored Delete all ignored files.
--quiet, -q Only display errors and warnings.
--unknown Delete files unknown to bzr (default).
--usage Show usage message and options.
--verbose, -v Display more information.
Remove unwanted files from working tree.
By default, only unknown files, not ignored files, are deleted. Ver‐
sioned files are never deleted.
Another class is ´detritus´, which includes files emitted by bzr during
normal operations and selftests. (The value of these files decreases
with time.)
If no options are specified, unknown files are deleted. Otherwise,
option flags are respected, and may be combined.
To check what clean-tree will do, use --dry-run.
bzr clone
Alias for "branch", see "bzr branch".
bzr co
Alias for "checkout", see "bzr checkout".
bzr commit [SELECTED...]
Options:
--author ARG Set the author´s name, if it´s different
from the committer.
--commit-time ARG Manually set a commit time using commit
date format, e.g. ´2009-10-10 08:00:00
+0100´.
--exclude ARG, -x Do not consider changes made to a given
path.
--file MSGFILE, -F Take commit message from this file.
--fixes ARG Mark a bug as being fixed by this
revision (see "bzr help bugs").
--help, -h Show help message.
--local Perform a local commit in a bound
branch. Local commits are not pushed to
the master branch until a normal commit
is performed.
--message ARG, -m Description of the new revision.
--quiet, -q Only display errors and warnings.
--show-diff When no message is supplied, show the
diff along with the status summary in
the message editor.
--strict Refuse to commit if there are unknown
files in the working tree.
--unchanged Commit even if nothing has changed.
--usage Show usage message and options.
--verbose, -v Display more information.
Aliases: ci, checkin
See also: add, bugs, hooks, uncommit
Commit changes into a new revision.
An explanatory message needs to be given for each commit. This is often
done by using the --message option (getting the message from the com‐
mand line) or by using the --file option (getting the message from a
file). If neither of these options is given, an editor is opened for
the user to enter the message. To see the changed files in the boiler‐
plate text loaded into the editor, use the --show-diff option.
By default, the entire tree is committed and the person doing the com‐
mit is assumed to be the author. These defaults can be overridden as
explained below.
Selective commits:
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.
When excludes are given, they take precedence over selected files.
For example, to commit only changes within foo, but not changes
within foo/bar:
bzr commit foo -x foo/bar
A selective commit after a merge is not yet supported.
Custom authors:
If the 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>". If there is more than one author of
the change you can specify the option multiple times, once for each
author.
Checks:
A common mistake is to forget to add a new file or directory before
running the commit command. The --strict option checks for unknown
files and aborts the commit if any are found. More advanced pre-com‐
mit
checks can be implemented by defining hooks. See ``bzr help hooks``
for details.
Things to note:
If you accidentially commit the wrong changes or make a spelling
mistake in the commit message say, you can use the uncommit command
to undo it. See ``bzr help uncommit`` for details.
Hooks can also be configured to run after a commit. This allows you
to trigger updates to external systems like bug trackers. The --fixes
option can be used to record the association between a revision and
one or more bugs. See ``bzr help bugs`` for details.
A selective 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 gen‐
eral
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
bzr conflicts
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--text List paths of files with text conflicts.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: conflict-types, resolve
List files with 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 encoun‐
ters 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 con‐
flicts.)
Use bzr resolve when you have fixed a problem.
bzr del
Alias for "remove", see "bzr remove".
bzr deleted
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--show-ids Show internal object ids.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: ls, status
List files deleted in the working tree.
bzr di
Alias for "diff", see "bzr diff".
bzr dif
Alias for "diff", see "bzr diff".
bzr diff [FILE...]
Options:
--change ARG, -c Select changes introduced by the
specified revision. See also "help
revisionspec".
--diff-options ARG Pass these options to the external diff
program.
--help, -h Show help message.
--new ARG Branch/tree to compare to.
--old ARG Branch/tree to compare from.
--prefix ARG, -p Set prefixes added to old and new
filenames, as two values separated by a
colon. (eg "old/:new/").
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--usage Show usage message and options.
--using ARG Use this command to compare files.
--verbose, -v Display more information.
Aliases: di, dif
See also: status
Show differences in the working tree, between revisions or branches.
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.
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and pro‐
duces patches suitable for "patch -p1".
Exit values:
1 - changed
2 - unrepresentable changes
3 - error
0 - no change
Examples:
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 3 and revision 1:
bzr diff -r1..3
Difference between revision 3 and revision 1 for branch xxx:
bzr diff -r1..3 xxx
To see the changes introduced in revision X:
bzr diff -cX
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:
bzr diff -r<chosen_parent>..X
The changes introduced by revision 2 (equivalent to -r1..2):
bzr diff -c2
Show just the differences for file NEWS:
bzr diff NEWS
Show the differences in working tree xxx for file NEWS:
bzr diff xxx/NEWS
Show the differences from branch xxx to this working tree:
bzr diff --old xxx
Show the differences between two branches for file NEWS:
bzr diff --old xxx --new yyy NEWS
Same as ´bzr diff´ but prefix paths with old/ and new/:
bzr diff --prefix old/:new/
bzr export DEST [BRANCH_OR_SUBDIR]
Options:
--filters Apply content filters to export the
convenient form.
--format ARG Type of file to export to.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--root ARG Name of the root directory inside the
exported file.
--usage Show usage message and options.
--verbose, -v Display more information.
Export current or past revision to a destination directory or archive.
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 con‐
tainer formats (tar, zip, etc). If it is not supplied it will default
to the exported filename. The root option has no effect for ´dir´ for‐
mat.
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
================= =========================
bzr get
Alias for "branch", see "bzr branch".
bzr help [TOPIC]
Options:
--help, -h Show help message.
--long Show help on all commands.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Aliases: ?, --help, -?, -h
See also: topics
Show help on a command or other topic.
bzr ignore [NAME_PATTERN...]
Options:
--help, -h Show help message.
--old-default-rules Write out the ignore rules bzr < 0.9
always used.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: ignored, patterns, status
Ignore specified files or patterns.
See ``bzr help patterns`` for details on the syntax of patterns.
If a .bzrignore file does not exist, the ignore command will create one
and add the specified files or patterns to the newly created file. The
ignore command will also automatically add the the use of the ignore
command will require an explicit add command.
To remove patterns from the ignore list, edit the .bzrignore file.
After adding, editing or deleting that file either indirectly by using
this command or directly by using an editor, be sure to commit it.
Patterns prefixed with ´!´ are exceptions to ignore patterns and take
precedence over regular ignores. Such exceptions are used to specify
files that should be versioned which would otherwise be ignored.
Patterns prefixed with ´!!´ act as regular ignore patterns, but have
precedence over the ´!´ exception patterns.
Note: ignore patterns containing shell wildcards must be quoted from
the shell on Unix.
Examples:
Ignore the top level Makefile:
bzr ignore ./Makefile
Ignore .class files in all directories...:
bzr ignore "*.class"
...but do not ignore "special.class":
bzr ignore "!special.class"
Ignore .o files under the lib directory:
bzr ignore "lib/**/*.o"
Ignore .o files under the lib directory:
bzr ignore "RE:lib/.*\.o"
Ignore everything but the "debian" toplevel directory:
bzr ignore "RE:(?!debian/).*"
Ignore everything except the "local" toplevel directory,
but always ignore "*~" autosave files, even under local/:
bzr ignore "*"
bzr ignore "!./local"
bzr ignore "!!*~"
bzr ignored
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: ignore, ls
List ignored files and the patterns that matched them.
List all the ignored files and the ignore pattern that caused the file
to be ignored.
Alternatively, to list just the files:
bzr ls --ignored
bzr info [LOCATION]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: repositories, revno, working-trees
Show information about a working tree, branch or repository.
This command will show all known locations and formats associated to
the tree, branch or repository.
In verbose mode, statistical information is included with each report.
To see extended statistic information, use a verbosity level of 2 or
higher by specifying the verbose option multiple times, e.g. -vv.
Branches and working trees will also report any missing revisions.
Examples:
Display information on the format and related locations:
bzr info
Display the above together with extended format information and
basic statistics (like the number of files in the working tree and
number of revisions in the branch and repository):
bzr info -v
Display the above together with number of committers to the branch:
bzr info -vv
bzr init [LOCATION]
Options:
--append-revisions-only Never change revnos or the existing log.
Append revisions to it only.
--create-prefix Create the path leading up to the branch
if it does not already exist.
--format ARG Specify a format for this branch. See
"help formats".
--1.14 A working-tree format that supports
content filtering.
--1.14-rich-root A variant of 1.14 that supports rich-
root data (needed for bzr-svn and bzr-
git).
--2a First format for bzr 2.0 series. Uses
group-compress storage. Provides rich
roots which are a one-way transition.
--default First format for bzr 2.0 series. Uses
group-compress storage. Provides rich
roots which are a one-way transition.
--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.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: branch, checkout, init-repository
Make a directory into a versioned branch.
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"
bzr init-repo
Alias for "init-repository", see "bzr init-repository".
bzr init-repository LOCATION
Options:
--format ARG Specify a format for this repository.
See "bzr help formats" for details.
--1.14 A working-tree format that supports
content filtering.
--1.14-rich-root A variant of 1.14 that supports rich-
root data (needed for bzr-svn and bzr-
git).
--2a First format for bzr 2.0 series. Uses
group-compress storage. Provides rich
roots which are a one-way transition.
--default First format for bzr 2.0 series. Uses
group-compress storage. Provides rich
roots which are a one-way transition.
--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.
--help, -h Show help message.
--no-trees Branches in the repository will default
to not having a working tree.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Alias: init-repo
See also: branch, checkout, init, repositories
Create a shared repository for branches to share storage space.
New branches created under the repository directory will store their
revisions in the repository, not in the branch directory. For branches
with shared history, this reduces the amount of storage needed and
speeds up the creation of new branches.
If the --no-trees option is given then the branches in the repository
will not have working trees by default. They will still exist as
directories on disk, but they will not have separate copies of the
files at a certain revision. This can be useful for repositories that
store branches which are interacted with through checkouts or remote
branches, such as on a server.
Examples:
Create a shared repository 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)
bzr join TREE
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: split
Combine a tree into its containing tree.
This command requires the target tree to be in a rich-root format.
The TREE argument should be an independent tree, inside another tree,
but not part of it. (Such trees can be produced by "bzr split", but
also by running "bzr branch" with the target inside a tree.)
The result is a combined tree, with the subtree no longer an indepen‐
dant part. This is marked as a merge of the subtree into the contain‐
ing tree, and all history is preserved.
bzr log [FILE...]
Options:
--change ARG, -c Show just the specified revision. See
also "help revisionspec".
--forward Show from oldest to newest.
--help, -h Show help message.
--include-merges Show merged revisions like --levels 0
does.
--levels N, -n Number of levels to display - 0 for all,
1 for flat.
--limit N, -l Limit the output to the first N
revisions.
--log-format ARG Use specified log format.
--gnu-changelog Format used by GNU ChangeLog files
--line Log format with one line per revision
--long Detailed log format
--short Moderately short log format
--message ARG, -m Show revisions whose message matches
this regular expression.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--show-diff, -p Show changes made in each revision as a
patch.
--show-ids Show internal object ids.
--timezone ARG Display timezone as local, original, or
utc.
--usage Show usage message and options.
--verbose, -v Show files changed in each revision.
See also: log-formats, revisionspec
Show historical log for a branch or subset of a branch.
log is bzr´s default tool for exploring the history of a branch. The
branch to use is taken from the first parameter. If no parameters are
given, the branch containing the working directory is logged. Here are
some simple examples:
bzr log log the current branch
bzr log foo.py log a file in its branch
bzr log http://server/branch log a branch on a server
The filtering, ordering and information shown for each revision can be
controlled as explained below. By default, all revisions are shown
sorted (topologically) so that newer revisions appear before older ones
and descendants always appear before ancestors. If displayed, merged
revisions are shown indented under the revision in which they were
merged.
Output control:
The log format controls how information about each revision is
displayed. The standard log formats are called ``long``, ``short``
and ``line``. The default is long. See ``bzr help log-formats``
for more details on log formats.
The following options can be used to control what information is
displayed:
-l N display a maximum of N revisions
-n N display N levels of revisions (0 for all, 1 for col‐
lapsed)
-v display a status summary (delta) for each revision
-p display a diff (patch) for each revision
--show-ids display revision-ids (and file-ids), not just revnos
Note that the default number of levels to display is a function of
the
log format. If the -n option is not used, the standard log formats
show
just the top level (mainline).
Status summaries are shown using status flags like A, M, etc. To see
the changes explained using words like ``added`` and ``modified``
instead, use the -vv option.
Ordering control:
To display revisions from oldest to newest, use the --forward option.
In most cases, using this option will have little impact on the total
time taken to produce a log, though --forward does not incrementally
display revisions like --reverse does when it can.
Revision filtering:
The -r option can be used to specify what revision or range of revi‐
sions
to filter against. The various forms are shown below:
-rX display revision X
-rX.. display revision X and later
-r..Y display up to and including revision Y
-rX..Y display from X to Y inclusive
See ``bzr help revisionspec`` for details on how to specify X and Y.
Some common examples are given below:
-r-1 show just the tip
-r-10.. show the last 10 mainline revisions
-rsubmit:.. show what´s new on this branch
-rancestor:path.. show changes since the common ancestor of this
branch and the one at location path
-rdate:yesterday.. show changes since yesterday
When logging a range of revisions using -rX..Y, log starts at
revision Y and searches back in history through the primary
("left-hand") parents until it finds X. When logging just the
top level (using -n1), an error is reported if X is not found
along the way. If multi-level logging is used (-n0), X may be
a nested merge revision and the log will be truncated accordingly.
Path filtering:
If parameters are given and the first one is not a branch, the log
will be filtered to show only those revisions that changed the
nominated files or directories.
Filenames are interpreted within their historical context. To log a
deleted file, specify a revision range so that the file existed at
the end or start of the range.
Historical context is also important when interpreting pathnames of
renamed files/directories. Consider the following example:
* revision 1: add tutorial.txt
* revision 2: modify tutorial.txt
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
In this case:
* ``bzr log guide.txt`` will log the file added in revision 1
* ``bzr log tutorial.txt`` will log the new file added in revision 3
* ``bzr log -r2 -p tutorial.txt`` will show the changes made to
the original file in revision 2.
* ``bzr log -r2 -p guide.txt`` will display an error message as there
was no file called guide.txt in revision 2.
Renames are always followed by log. By design, there is no need to
explicitly ask for this (and no way to stop logging a file back
until it was last renamed).
Other filtering:
The --message option can be used for finding revisions that match a
regular expression in a commit message.
Tips & tricks:
GUI tools and IDEs are often better at exploring history than command
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk
packages
respectively for example. (TortoiseBzr uses qlog for displaying
logs.) See
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEInte‐
gration.
Web interfaces are often better at exploring history than command
line
tools, particularly for branches on servers. You may prefer Logger‐
head
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
You may find it useful to add the aliases below to ``bazaar.conf``:
[ALIASES]
tip = log -r-1
top = log -l10 --line
show = log -v -p
``bzr tip`` will then show the latest revision while ``bzr top``
will show the last 10 mainline revisions. To see the details of a
particular revision X, ``bzr show -rX``.
If you are interested in looking deeper into a particular merge X,
use ``bzr log -n0 -rX``.
``bzr log -v`` on a branch with lots of history is currently
very slow. A fix for this issue is currently under development.
With or without that fix, it is recommended that a revision range
be given when using the -v option.
bzr has a generic full-text matching plugin, bzr-search, that can be
used to find revisions matching user names, commit messages, etc.
Among other features, this plugin can find all revisions containing
a list of words but not others.
When exploring non-mainline history on large projects with deep
history, the performance of log can be greatly improved by installing
the historycache plugin. This plugin buffers historical information
trading disk space for faster speed.
bzr ls [PATH]
Options:
--from-root Print paths relative to the root of the
branch.
--help, -h Show help message.
--ignored Print ignored files.
--kind ARG List entries of a particular kind: file,
directory, symlink.
--null Write an ascii NUL (\0) separator
between files rather than a newline.
--quiet, -q Only display errors and warnings.
--recursive, -R Recurse into subdirectories.
--revision ARG, -r See "help revisionspec" for details.
--show-ids Show internal object ids.
--unknown Print unknown files.
--usage Show usage message and options.
--verbose, -v Display more information.
--versioned, -V Print versioned files.
See also: cat, status
List files in a tree.
bzr merge [LOCATION]
Options:
--change ARG, -c Select changes introduced by the
specified revision. See also "help
revisionspec".
--directory ARG, -d Branch to merge into, rather than the
one containing the working directory.
--force Merge even if the destination tree has
uncommitted changes.
--help, -h Show help message.
--interactive, -i Select changes interactively.
--merge-type ARG Select a particular merge algorithm.
--diff3 Merge using external diff3
--lca LCA-newness merge
--merge3 Native diff3-style merge
--weave Weave-based merge
--preview Instead of merging, show a diff of the
merge.
--pull If the destination is already completely
merged into the source, pull from the
source rather than merging. When this
happens, you do not need to commit the
result.
--quiet, -q Only display errors and warnings.
--remember Remember the specified location as a
default.
--reprocess Reprocess to reduce spurious conflicts.
--revision ARG, -r See "help revisionspec" for details.
--show-base Show base revision text in conflicts.
--uncommitted Apply uncommitted changes from a working
copy, instead of branch changes.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: remerge, send, status-flags, update
Perform a three-way merge.
The source of the merge can be specified either in the form of a
branch, or in the form of a path to a file containing a merge directive
generated with bzr send. If neither is specified, the default is the
upstream branch or the branch most recently merged using --remember.
When merging a branch, by default the tip will be merged. To pick a
different revision, pass --revision. If you specify two values, the
first will be used as BASE and the second one as OTHER. Merging indi‐
vidual revisions, or a subset of available revisions, like this is com‐
monly referred to as "cherrypicking".
Revision numbers are always relative to the branch being merged.
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 encoun‐
ters 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 direc‐
tory, where they can be reviewed (with bzr diff), tested, and then com‐
mitted to record the result of the merge.
merge refuses to run if there are any uncommitted changes, unless
--force is given. The --force option can also be used to create a merge
revision which has more than two parents.
If one would like to merge changes from the working tree of the other
branch without merging any committed revisions, the --uncommitted
option can be given.
To select only some changes to merge, use "merge -i", which will prompt
you to apply each diff hunk and file change, similar to "shelve".
Examples:
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
To apply a merge directive contained in /tmp/merge:
bzr merge /tmp/merge
To create a merge revision with three parents from two branches
feature1a and feature1b:
bzr merge ../feature1a
bzr merge ../feature1b --force
bzr commit -m ´revision with three parents´
bzr missing [OTHER_BRANCH]
Options:
--help, -h Show help message.
--include-merges Show all revisions in addition to the
mainline ones.
--log-format ARG Use specified log format.
--gnu-changelog Format used by GNU ChangeLog files
--line Log format with one line per revision
--long Detailed log format
--short Moderately short log format
--mine-only Display changes in the local branch
only.
--my-revision ARG Filter on local branch revisions
(inclusive). See "help revisionspec" for
details.
--other Same as --theirs-only.
--quiet, -q Only display errors and warnings.
--reverse Reverse the order of revisions.
--revision ARG, -r Filter on other branch revisions
(inclusive). See "help revisionspec" for
details.
--show-ids Show internal object ids.
--theirs-only Display changes in the remote branch
only.
--this Same as --mine-only.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: merge, pull
Show unmerged/unpulled revisions between two branches.
OTHER_BRANCH may be local or remote.
To filter on a range of revisions, you can use the command -r
begin..end -r revision requests a specific revision, -r ..end or -r
begin.. are also valid.
Exit values:
1 - some missing revisions
0 - no missing revisions
Examples:
Determine the missing revisions between this and the branch at the
remembered pull location:
bzr missing
Determine the missing revisions between this and another branch:
bzr missing http://server/branch
Determine the missing revisions up to a specific revision on the
other
branch:
bzr missing -r ..-10
Determine the missing revisions up to a specific revision on this
branch:
bzr missing --my-revision ..-10
bzr mkdir DIR...
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Create a new versioned directory.
This is equivalent to creating the directory and then adding it.
bzr move
Alias for "mv", see "bzr mv".
bzr mv [NAMES...]
Options:
--after Move only the bzr identifier of the
file, because the file has already been
moved.
--auto Automatically guess renames.
--dry-run Avoid making changes when guessing
renames.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Aliases: move, rename
Move or rename a file.
Usage:
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 NEW‐
NAME does exist on the filesystem but is not versioned, mv assumes that
the file has been manually moved and only updates its internal inven‐
tory to reflect that change. The same is valid when moving many SOURCE
files to a DESTINATION.
Files cannot be moved between branches.
bzr nick [NICKNAME]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: info
Print or set the branch nickname.
If unset, the tree root directory name is used as the nickname. To
print the current nickname, execute with no argument.
Bound branches use the nickname of its master branch unless it is set
locally.
bzr pack [BRANCH_OR_REPO]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: repositories
Compress the data within a repository.
bzr plugins
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
List the installed plugins.
This command displays the list of installed plugins including version
of plugin and a short description of each.
--verbose shows the path where each plugin is located.
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 com‐
mands, providing additional network transports and customizing log out‐
put.
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.
bzr praise
Alias for "annotate", see "bzr annotate".
bzr pull [LOCATION]
Options:
--directory ARG, -d Branch to pull into, rather than the one
containing the working directory.
--help, -h Show help message.
--local Perform a local pull in a bound branch.
Local pulls are not applied to the
master branch.
--overwrite Ignore differences between branches and
overwrite unconditionally.
--quiet, -q Only display errors and warnings.
--remember Remember the specified location as a
default.
--revision ARG, -r See "help revisionspec" for details.
--usage Show usage message and options.
--verbose, -v Show logs of pulled revisions.
See also: push, send, status-flags, update
Turn this branch into a mirror of another branch.
By default, 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 replace your local changes and just want your branch to
match the remote one, use pull --overwrite. This will work even if the
two branches have diverged.
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.
Note: The location can be specified either in the form of a branch, or
in the form of a path to a file containing a merge directive generated
with bzr send.
bzr push [LOCATION]
Options:
--create-prefix Create the path leading up to the branch
if it does not already exist.
--directory ARG, -d Branch to push from, rather than the one
containing the working directory.
--help, -h Show help message.
--overwrite Ignore differences between branches and
overwrite unconditionally.
--quiet, -q Only display errors and warnings.
--remember Remember the specified location as a
default.
--revision ARG, -r See "help revisionspec" for details.
--stacked Create a stacked branch that references
the public location of the parent
branch.
--stacked-on ARG Create a stacked branch that refers to
another branch for the commit history.
Only the work not present in the
referenced branch is included in the
branch created.
--strict Refuse to push if there are uncommitted
changes in the working tree, --no-strict
disables the check.
--usage Show usage message and options.
--use-existing-dir By default push will fail if the target
directory exists, but does not already
have a control directory. This flag
will allow push to proceed.
--verbose, -v Display more information.
See also: pull, update, working-trees
Update a mirror of this branch.
The target branch will not have its working tree populated because this
is both expensive, and is not supported on remote file systems.
Some smart servers or protocols *may* put the working tree in place in
the future.
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) by the source
branch.
If branches have diverged, you can use ´bzr push --overwrite´ to
replace the other branch completely, discarding its unmerged changes.
If you want to ensure you have the different changes in the other
branch, do a merge (see bzr help merge) from the other branch, and com‐
mit that. After that you will be able to do a push without ´--over‐
write´.
If there is no default push location set, the first push 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.
bzr reconcile [BRANCH]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: check
Reconcile bzr metadata in a branch.
This can correct data mismatches that may have been caused by previous
ghost operations or bzr upgrades. You should only need to run this com‐
mand if ´bzr check´ or a bzr developer advises you to run it.
If a second branch is provided, cross-branch reconciliation is also
attempted, which will check that data like the tree root id which was
not present in very early bzr versions is represented correctly in both
branches.
At the same time it is run it may recompress data resulting in a poten‐
tial saving in disk space or performance gain.
The branch *MUST* be on a listable system such as local disk or sftp.
bzr reconfigure [LOCATION]
Options:
--bind-to ARG Branch to bind checkout to.
--force Perform reconfiguration even if local
changes will be lost.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--stacked-on ARG Reconfigure a branch to be stacked on
another branch.
--target_type ARG The type to reconfigure the directory
to.
--branch Reconfigure to be an unbound branch with
no working tree.
--checkout Reconfigure to be a bound branch with a
working tree.
--lightweight-checkout Reconfigure to be a lightweight checkout
(with no local history).
--standalone Reconfigure to be a standalone branch
(i.e. stop using shared repository).
--tree Reconfigure to be an unbound branch with
a working tree.
--use-shared Reconfigure to use a shared repository.
--with-no-trees Reconfigure repository to not create
working trees on branches by default.
--with-trees Reconfigure repository to create working
trees on branches by default.
--unstacked Reconfigure a branch to be unstacked.
This may require copying substantial
data into it.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: branches, checkouts, standalone-trees, working-trees
Reconfigure the type of a bzr directory.
A target configuration must be specified.
For checkouts, the bind-to location will be auto-detected if not speci‐
fied. The order of preference is 1. For a lightweight checkout, the
current bound location. 2. For branches that used to be checkouts, the
previously-bound location. 3. The push location. 4. The parent loca‐
tion. If none of these is available, --bind-to must be specified.
bzr remerge [FILE...]
Options:
--help, -h Show help message.
--merge-type ARG Select a particular merge algorithm.
--diff3 Merge using external diff3
--lca LCA-newness merge
--merge3 Native diff3-style merge
--weave Weave-based merge
--quiet, -q Only display errors and warnings.
--reprocess Reprocess to reduce spurious conflicts.
--show-base Show base revision text in conflicts.
--usage Show usage message and options.
--verbose, -v Display more information.
Redo a merge.
Use this if you want to try a different merge technique while resolving
conflicts. Some merge techniques are better than others, and remerge
lets you try different ones on different files.
The options for remerge have the same meaning and defaults as the ones
for merge. The difference is that remerge can (only) be run when there
is a pending merge, and it lets you specify particular files.
Examples:
Re-do the merge of all conflicted files, and show the base text in
conflict regions, in addition to the usual THIS and OTHER texts:
bzr remerge --show-base
Re-do the merge of "foobar", using the weave merge algorithm, with
additional processing to reduce the size of conflict regions:
bzr remerge --merge-type weave --reprocess foobar
bzr remove [FILE...]
Options:
--file-deletion-strategy ARGThe file deletion mode to be used.
--force Delete all the specified files, even if
they can not be recovered and even if
they are non-empty directories.
--keep Delete from bzr but leave the working
copy.
--safe Only delete files if they can be safely
recovered (default).
--help, -h Show help message.
--new Only remove files that have never been
committed.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Aliases: rm, del
Remove files or directories.
This makes bzr stop tracking changes to the specified files. bzr will
delete them if they can easily be recovered using revert. If no options
or parameters are given bzr will scan for files that are being tracked
by bzr but missing in your tree and stop tracking them for you.
bzr remove-tree [LOCATION]
Options:
--force Remove the working tree even if it has
uncommitted changes.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: checkout, working-trees
Remove the working tree from a given branch/checkout.
Since a lightweight checkout is little more than a working tree this
will refuse to run against one.
To re-create the working tree, use "bzr checkout".
bzr rename
Alias for "mv", see "bzr mv".
bzr renames [DIR]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: status
Show list of renamed files.
bzr resolve [FILE...]
Options:
--all Resolve all conflicts in this tree.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Alias: resolved
See also: conflicts
Mark a conflict as resolved.
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 encoun‐
ters those, it will mark a conflict. A conflict means that you need to
fix something, before you should commit.
Once you have fixed a problem, use "bzr resolve" to automatically mark
text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict
as resolved, or "bzr resolve --all" to mark all conflicts as resolved.
bzr resolved
Alias for "resolve", see "bzr resolve".
bzr revert [FILE...]
Options:
--forget-merges Remove pending merge marker, without
changing any files.
--help, -h Show help message.
--no-backup Do not save backups of reverted files.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: cat, export
Revert files to a previous revision.
Giving a list of files will revert only those files. Otherwise, all
files will be reverted. If the revision is not specified with ´--revi‐
sion´, the last committed revision is used.
To remove only some changes, without reverting to a prior version, use
merge instead. For example, "merge . --revision -2..-3" will remove
the changes introduced by -2, without affecting the changes introduced
by -1. Or to remove certain changes on a hunk-by-hunk basis, see the
Shelf plugin.
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 ´.~#~´ appended to their name, where # is a number.
When you provide files, you can use their current pathname or the path‐
name from the target revision. So you can use revert to "undelete" a
file by name. If you name a directory, all the contents of that direc‐
tory will be reverted.
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.
The working tree contains a list of revisions that have been merged but
not yet committed. These revisions will be included as additional par‐
ents 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
``bzr revert and ``bzr revert --forget-merges`` to clear the pending
merge list without reverting any files.
Using "bzr revert --forget-merges", 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 "--forget-merges" 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.
bzr revno [LOCATION]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--tree Show revno of working tree
--usage Show usage message and options.
--verbose, -v Display more information.
See also: info
Show current revision number.
This is equal to the number of revisions on this branch.
bzr rm
Alias for "remove", see "bzr remove".
bzr root [FILENAME]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Show the tree root directory.
The root is the nearest enclosing directory with a .bzr control direc‐
tory.
bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
Options:
--body ARG Body for the email.
--format ARG Use the specified output format.
--from ARG, -f Branch to generate the submission from,
rather than the one containing the
working directory.
--help, -h Show help message.
--mail-to ARG Mail the request to this address.
--message ARG, -m Message string.
--no-bundle Do not include a bundle in the merge
directive.
--no-patch Do not include a preview patch in the
merge directive.
--output ARG, -o Write merge directive to this file; use
- for stdout.
--quiet, -q Only display errors and warnings.
--remember Remember submit and public branch.
--revision ARG, -r See "help revisionspec" for details.
--strict Refuse to send if there are uncommitted
changes in the working tree, --no-strict
disables the check.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: merge, pull
Mail or create a merge-directive for submitting changes.
A merge directive provides many things needed for requesting merges:
* A machine-readable description of the merge to perform
* An optional patch that is a preview of the changes requested
* An optional bundle of revision data, so that the changes can be
applied
directly from the merge directive, without retrieving data from a
branch.
`bzr send` creates a compact data set that, when applied using bzr
merge, has the same effect as merging from the source branch.
By default the merge directive is self-contained and can be applied to
any branch containing submit_branch in its ancestory without needing
access to the source branch.
If --no-bundle is specified, then Bazaar doesn´t send the contents of
the revisions, but only a structured request to merge from the pub‐
lic_location. In that case the public_branch is needed and it must be
up-to-date and accessible to the recipient. The public_branch is
always included if known, so that people can check it later.
The submit branch defaults to the parent of the source branch, but can
be overridden. Both submit branch and public branch will be remembered
in branch.conf the first time they are used for a particular branch.
The source branch defaults to that containing the working directory,
but can be changed using --from.
In order to calculate those changes, bzr must analyse the submit
branch. Therefore it is most efficient for the submit branch to be a
local mirror. If a public location is known for the submit_branch,
that location is used in the merge directive.
The default behaviour is to send the merge directive by mail, unless -o
is given, in which case it is sent to a file.
Mail is sent using your preferred mail program. This should be trans‐
parent on Windows (it uses MAPI). On Linux, it requires the xdg-email
utility. If the preferred client can´t be found (or used), your editor
will be used.
To use a specific mail program, set the mail_client configuration
option. (For Thunderbird 1.5, this works around some bugs.) Supported
values for specific clients are "claws", "evolution", "kmail",
"mail.app" (MacOS X´s Mail.app), "mutt", and "thunderbird"; generic
options are "default", "editor", "emacsclient", "mapi", and
"xdg-email". Plugins may also add supported clients.
If mail is being sent, a to address is required. This can be supplied
either on the commandline, by setting the submit_to configuration
option in the branch itself or the child_submit_to configuration option
in the submit branch.
Two formats are currently supported: "4" uses revision bundle format 4
and merge directive format 2. It is significantly faster and smaller
than older formats. It is compatible with Bazaar 0.19 and later. It
is the default. "0.9" uses revision bundle format 0.9 and merge direc‐
tive format 1. It is compatible with Bazaar 0.12 - 0.18.
The merge directives created by bzr send may be applied using bzr merge
or bzr pull by specifying a file containing a merge directive as the
location.
bzr send makes extensive use of public locations to map local locations
into URLs that can be used by other people. See `bzr help configura‐
tion` to set them, and use `bzr info` to display them.
bzr serve
Options:
--allow-writes By default the server is a readonly
server. Supplying --allow-writes
enables write access to the contents of
the served directory and below. Note
that ``bzr serve`` does not perform
authentication, so unless some form of
external authentication is arranged
supplying this option leads to global
uncontrolled write access to your file
system.
--directory ARG Serve contents of this directory.
--help, -h Show help message.
--inet Serve on stdin/out for use from inetd or
sshd.
--port ARG Listen for connections on nominated port
of the form [hostname:]portnumber.
Passing 0 as the port number will result
in a dynamically allocated port. The
default port depends on the protocol.
--protocol ARG Protocol to serve.
--bzr The Bazaar smart server protocol over
TCP. (default port: 4155)
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Alias: server
Run the bzr server.
bzr server
Alias for "serve", see "bzr serve".
bzr shelve [FILE...]
Options:
--all Shelve all changes.
--destroy Destroy removed changes instead of
shelving them.
--help, -h Show help message.
--list List shelved changes.
--message ARG, -m Message string.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--usage Show usage message and options.
--verbose, -v Display more information.
--writer ARG Method to use for writing diffs.
--plain Plaintext diff output.
See also: unshelve
Temporarily set aside some changes from the current tree.
Shelve allows you to temporarily put changes you´ve made "on the
shelf", ie. out of the way, until a later time when you can bring them
back from the shelf with the ´unshelve´ command. The changes are
stored alongside your working tree, and so they aren´t propagated along
with your branch nor will they survive its deletion.
If shelve --list is specified, previously-shelved changes are listed.
Shelve is intended to help separate several sets of changes that have
been inappropriately mingled. If you just want to get rid of all
changes and you don´t need to restore them later, use revert. If you
want to shelve all text changes at once, use shelve --all.
If filenames are specified, only the changes to those files will be
shelved. Other files will be left untouched.
If a revision is specified, changes since that revision will be
shelved.
You can put multiple items on the shelf, and by default, ´unshelve´
will restore the most recently shelved changes.
bzr sign-my-commits [LOCATION] [COMMITTER]
Options:
--dry-run Don´t actually sign anything, just print
the revisions that would be signed.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Sign all commits by a given committer.
If location is not specified the local tree is used. If committer is
not specified the default committer is used.
This does not sign commits that already have signatures.
bzr split TREE
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: join
Split a subdirectory of a tree into a separate tree.
This command will produce a target tree in a format that supports rich
roots, like ´rich-root´ or ´rich-root-pack´. These formats cannot be
converted into earlier formats like ´dirstate-tags´.
The TREE argument should be a subdirectory of a working tree. That
subdirectory will be converted into an independent tree, with its own
branch. Commits in the top-level tree will not apply to the new sub‐
tree.
bzr st
Alias for "status", see "bzr status".
bzr stat
Alias for "status", see "bzr status".
bzr status [FILE...]
Options:
--change ARG, -c Select changes introduced by the
specified revision. See also "help
revisionspec".
--help, -h Show help message.
--no-pending Don´t show pending merges.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--short, -S Use short status indicators.
--show-ids Show internal object ids.
--usage Show usage message and options.
--verbose, -v Display more information.
--versioned, -V Only show versioned files.
Aliases: st, stat
See also: diff, revert, status-flags
Display status summary.
This reports on versioned and unknown files, reporting them grouped by
state. Possible states are:
added
Versioned in the working copy but not in the previous revision.
removed
Versioned in the previous revision but removed or deleted
in the working copy.
renamed
Path of this file changed from the previous revision;
the text may also have changed. This includes files whose
parent directory was renamed.
modified
Text has changed since the previous revision.
kind changed
File kind has been changed (e.g. from file to directory).
unknown
Not versioned and not matching an ignore pattern.
Additionally for directories, symlinks and files with an executable
bit, Bazaar indicates their type using a trailing character: ´/´, ´@´
or ´*´ respectively.
To see ignored files use ´bzr ignored´. For details on the changes to
file texts, use ´bzr diff´.
Note that --short or -S gives status flags for each item, similar to
Subversion´s status command. To get output similar to svn -q, use bzr
status -SV.
If no arguments are specified, the status of the entire working direc‐
tory is shown. Otherwise, only the status of the specified files or
directories is reported. If a directory is given, status is reported
for everything inside that directory.
Before merges are committed, the pending merge tip revisions are shown.
To see all pending merge revisions, use the -v option. To skip the
display of pending merge information altogether, use the no-pending
option or specify a file/directory.
If a revision argument is given, the status is calculated against that
revision, or between two revisions if two are provided.
bzr switch [TO_LOCATION]
Options:
--create-branch, -b Create the target branch from this one
before switching to it.
--force Switch even if local commits will be
lost.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--usage Show usage message and options.
--verbose, -v Display more information.
Set the branch of a checkout and update.
For lightweight checkouts, this changes the branch being referenced.
For heavyweight checkouts, this checks that there are no local commits
versus the current bound branch, then it makes the local branch a mir‐
ror of the new location and binds to it.
In both cases, the working tree is updated and uncommitted changes are
merged. The user can commit or revert these as they desire.
Pending merges need to be committed or reverted before using switch.
The path to the branch to switch to can be specified relative to the
parent directory of the current branch. For example, if you are cur‐
rently in a checkout of /path/to/branch, specifying ´newbranch´ will
find a branch at /path/to/newbranch.
Bound branches use the nickname of its master branch unless it is set
locally, in which case switching will update the local nickname to be
that of the master.
bzr tag TAG_NAME
Options:
--delete Delete this tag rather than placing it.
--directory ARG, -d Branch in which to place the tag.
--force Replace existing tags.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: commit, tags
Create, remove or modify a tag naming a revision.
Tags give human-meaningful names to revisions. Commands that take a -r
(--revision) option can be given -rtag:X, where X is any previously
created tag.
Tags are stored in the branch. Tags are copied from one branch to
another along when you branch, push, pull or merge.
It is an error to give a tag name that already exists unless you pass
--force, in which case the tag is moved to point to the new revision.
To rename a tag (change the name but keep it on the same revsion), run
``bzr tag new-name -r tag:old-name`` and then ``bzr tag --delete old‐
name``.
bzr tags
Options:
--directory ARG, -d Branch whose tags should be displayed.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--show-ids Show internal object ids.
--sort ARG Sort tags by different criteria.
"alpha": Sort tags lexicographically
(default). "time": Sort tags
chronologically.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: tag
List tags.
This command shows a table of tag names and the revisions they refer‐
ence.
bzr testament [BRANCH]
Options:
--help, -h Show help message.
--long Produce long-format testament.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--strict Produce a strict-format testament.
--usage Show usage message and options.
--verbose, -v Display more information.
Show testament (signing-form) of a revision.
bzr unbind
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: bind, checkouts
Convert the current checkout into a regular branch.
After unbinding, the local branch is considered independent and subse‐
quent commits will be local only.
bzr uncommit [LOCATION]
Options:
--dry-run Don´t actually make changes.
--force Say yes to all questions.
--help, -h Show help message.
--local Only remove the commits from the local
branch when in a checkout.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: commit
Remove the last committed revision.
--verbose will print out what is being removed. --dry-run will go
through all the motions, but not actually remove anything.
If --revision is specified, uncommit revisions to leave the branch at
the specified revision. For example, "bzr uncommit -r 15" will leave
the branch at revision 15.
Uncommit leaves the working tree ready for a new commit. The only
change it may make is to restore any pending merges that were present
before the commit.
bzr unshelve [SHELF_ID]
Options:
--action ARG The action to perform.
--apply Apply changes and remove from the shelf.
--delete-only Delete changes without applying them.
--dry-run Show changes, but do not apply or remove
them.
--keep Apply changes but don´t delete them.
--preview Instead of unshelving the changes, show
the diff that would result from
unshelving.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: shelve
Restore shelved changes.
By default, the most recently shelved changes are restored. However if
you specify a shelf by id those changes will be restored instead. This
works best when the changes don´t depend on each other.
bzr up
Alias for "update", see "bzr update".
bzr update [DIR]
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--revision ARG, -r See "help revisionspec" for details.
--usage Show usage message and options.
--verbose, -v Display more information.
Alias: up
See also: pull, status-flags, working-trees
Update a tree to have the latest code committed to its branch.
This will perform a merge into the working tree, and may generate con‐
flicts. If you have any local changes, you will still need to commit
them after the update for the update to be complete.
If you want to discard your local changes, you can just do a ´bzr
revert´ instead of ´bzr commit´ after the update.
If the tree´s branch is bound to a master branch, it will also update
the branch from the master.
bzr upgrade [URL]
Options:
--format ARG Upgrade to a specific format. See "bzr
help formats" for details.
--1.14 A working-tree format that supports
content filtering.
--1.14-rich-root A variant of 1.14 that supports rich-
root data (needed for bzr-svn and bzr-
git).
--2a First format for bzr 2.0 series. Uses
group-compress storage. Provides rich
roots which are a one-way transition.
--default First format for bzr 2.0 series. Uses
group-compress storage. Provides rich
roots which are a one-way transition.
--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.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
See also: check
Upgrade branch storage to current format.
The check command or bzr developers may sometimes advise you to run
this command. When the default format has changed you may also be
warned during other operations to upgrade.
bzr version
Options:
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--short Print just the version number.
--usage Show usage message and options.
--verbose, -v Display more information.
Show version of bzr.
bzr version-info [LOCATION]
Options:
--all Include all possible information.
--check-clean Check if tree is clean.
--format ARG Select the output format.
--custom Version info in Custom template-based
format.
--python Version info in Python format.
--rio Version info in RIO (simple text) format
(default).
--help, -h Show help message.
--include-file-revisions Include the last revision for each file.
--include-history Include the revision-history.
--quiet, -q Only display errors and warnings.
--template ARG Template for the output.
--usage Show usage message and options.
--verbose, -v Display more information.
Show version information about this tree.
You can use this command to add information about version into source
code of an application. The output can be in one of the supported for‐
mats or in a custom format based on a template.
For example:
bzr version-info --custom \
--template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n"
will produce a C header file with formatted string containing the cur‐
rent revision number. Other supported variables in templates are:
* {date} - date of the last revision
* {build_date} - current date
* {revno} - revision number
* {revision_id} - revision id
* {branch_nick} - branch nickname
* {clean} - 0 if the source tree contains uncommitted changes,
otherwise 1
bzr view [FILE...]
Options:
--all Apply list or delete action to all
views.
--delete Delete the view.
--help, -h Show help message.
--name ARG Name of the view to define, list or
delete.
--quiet, -q Only display errors and warnings.
--switch ARG Name of the view to switch to.
--usage Show usage message and options.
--verbose, -v Display more information.
Manage filtered views.
Views provide a mask over the tree so that users can focus on a subset
of a tree when doing their work. After creating a view, commands that
support a list of files - status, diff, commit, etc - effectively have
that list of files implicitly given each time. An explicit list of
files can still be given but those files must be within the current
view.
In most cases, a view has a short life-span: it is created to make a
selected change and is deleted once that change is committed. At other
times, you may wish to create one or more named views and switch
between them.
To disable the current view without deleting it, you can switch to the
pseudo view called ``off``. This can be useful when you need to see the
whole tree for an operation or two (e.g. merge) but want to switch back
to your view after that.
Examples:
To define the current view:
bzr view file1 dir1 ...
To list the current view:
bzr view
To delete the current view:
bzr view --delete
To disable the current view without deleting it:
bzr view --switch off
To define a named view and switch to it:
bzr view --name view-name file1 dir1 ...
To list a named view:
bzr view --name view-name
To delete a named view:
bzr view --name view-name --delete
To switch to a named view:
bzr view --switch view-name
To list all views defined:
bzr view --all
To delete all views:
bzr view --delete --all
bzr whoami [NAME]
Options:
--branch Set identity for the current branch
instead of globally.
--email Display email address only.
--help, -h Show help message.
--quiet, -q Only display errors and warnings.
--usage Show usage message and options.
--verbose, -v Display more information.
Show or set bzr user id.
Examples:
Show the email of the current user:
bzr whoami --email
Set the current user:
bzr whoami "Frank Chu <fchu@example.com>"
ENVIRONMENT
BZRPATH
Path where bzr is to look for shell plugin external commands.
BZR_EMAIL
E-Mail address of the user. Overrides default user config.
EMAIL E-Mail address of the user. Overrides default user config.
BZR_EDITOR
Editor for editing commit messages
EDITOR Editor for editing commit messages
BZR_PLUGIN_PATH
Paths where bzr should look for plugins
BZR_HOME
Home directory for bzrFILES
~/.bazaar/bazaar.conf
Contains the user´s default configuration. The section [DEFAULT]
is used to define general configuration that will be applied
everywhere. The section [ALIASES] can be used to create command
aliases for commonly used options.
A typical config file might look something like:
[DEFAULT]
email=John Doe <jdoe@isp.com>
[ALIASES]
commit = commit --strict
log10 = log --short -r -10..-1
SEE ALSO
http://www.bazaar-vcs.org/
2.1.1 2010-11-23 bzr(1)
