bzr

Bazaar (bzr) - next-generation distributed version control

bzr command [ command_options ]
bzr help
bzr help command

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 people work on it in teams.

bzr add [FILE...]

bzr annotate FILENAME

bzr bind [LOCATION]

bzr branch FROM_LOCATION [TO_LOCATION]

bzr break-lock [LOCATION]

bzr cat FILENAME

bzr check [BRANCH]

bzr checkout [BRANCH_LOCATION] [TO_LOCATION]

bzr commit [SELECTED...]

bzr conflicts

bzr deleted

bzr diff [FILE...]

bzr export DEST [BRANCH]

bzr help [TOPIC]

bzr ignore [NAME_PATTERN...]

bzr ignored

bzr info [LOCATION]

bzr init [LOCATION]

bzr init-repository LOCATION

bzr log [LOCATION]

bzr ls [PATH]

bzr merge [BRANCH]

bzr missing [OTHER_BRANCH]

bzr mkdir DIR...

bzr mv [NAMES...]

bzr nick [NICKNAME]

bzr pack [BRANCH_OR_REPO]

bzr plugins

bzr pull [LOCATION]

bzr push [LOCATION]

bzr reconcile [BRANCH]

bzr remerge [FILE...]

bzr remove [FILE...]

bzr remove-tree [LOCATION]

bzr renames [DIR]

bzr resolve [FILE...]

bzr revert [FILE...]

bzr revno [LOCATION]

bzr root [FILENAME]

bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]

bzr serve

bzr sign-my-commits [LOCATION] [COMMITTER]

bzr status [FILE...]

bzr tag TAG_NAME

bzr tags

bzr testament [BRANCH]

bzr unbind

bzr uncommit [LOCATION]

bzr update [DIR]

bzr upgrade [URL]

bzr version

bzr version-info [LOCATION]

bzr whoami [NAME]

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. --verbose, -v Display more information. See also: 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 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.

bzr annotate FILENAME

Options: --all Show annotations on all lines. --help, -h Show help message. --long Show commit date in annotations. --revision ARG, -r See \'help revisionspec\' for details. --show-ids Show internal object ids. 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. 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.

bzr branch FROM_LOCATION [TO_LOCATION]

Options: --help, -h Show help message. --revision ARG, -r See \'help revisionspec\' for details. Aliases: get, clone See also: checkout Create a new copy of a 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 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".

bzr break-lock [LOCATION]

Options: --help, -h Show help message. 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\' command. Examples: bzr break-lock

bzr cat FILENAME

Options: --help, -h Show help message. --name-from-revision The path name in the old tree. --revision ARG, -r See \'help revisionspec\' for details. 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 [BRANCH]

Options: --help, -h Show help message. --verbose, -v Display more information. See also: reconcile Validate consistency of branch history. This command checks various invariants about the branch storage to detect data corruption or bzr bugs.

bzr checkout [BRANCH_LOCATION] [TO_LOCATION]

Options: --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. --revision ARG, -r See \'help revisionspec\' for details. 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_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.)

bzr commit [SELECTED...]

Options: --file MSGFILE, -F Take commit message from this file. --fixes ARG Mark a bug as being fixed by this revision. --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. --strict Refuse to commit if there are unknown files in the working tree. --unchanged Commit even if nothing has changed. --verbose, -v Display more information. Aliases: ci, checkin See also: bugs, uncommit Commit changes into a new revision. 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. 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.

bzr conflicts

Options: --help, -h Show help message. --text List paths of files with text conflicts. 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 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.

bzr deleted

Options: --help, -h Show help message. --show-ids Show internal object ids. See also: ls, status List files deleted in the working tree.

bzr diff [FILE...]

Options: --diff-options ARG Pass these options to the external diff program. --help, -h Show help message. --prefix ARG, -p Set prefixes to added to old and new filenames, as two values separated by a colon. (eg "old/:new/"). --revision ARG, -r See \'help revisionspec\' for details. Aliases: di, dif See also: status Show differences in the working tree or between revisions. 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". 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 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

bzr export DEST [BRANCH]

Options: --format ARG Type of file to export to. --help, -h Show help message. --revision ARG, -r See \'help revisionspec\' for details. --root ARG Name of the root directory inside the exported file. 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 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 ================= =========================

bzr help [TOPIC]

Options: --help, -h Show help message. --long Show help on all commands. 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. See also: ignored, status Ignore specified files or patterns. 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. Examples: 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\'

bzr ignored

Options: --help, -h Show help message. See also: ignore List ignored files and the patterns that matched them.

bzr info [LOCATION]

Options: --help, -h Show help message. --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. Statistical information is included with each report. Branches and working trees will also report any missing revisions.

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". --default New in 0.15: Fast local operations. Compatible with bzr 0.8 and above when accessed over the network. --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. --dirstate-with-subtree New in 0.15: Fast local operations and improved scaling for network operations. Additionally adds support for versioning nested bzr branches. 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. --weave Pre-0.8 format. Slower than knit and does not support checkouts or shared repositories. --help, -h Show help message. 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-repository LOCATION

Options: --format ARG Specify a format for this repository. See "bzr help formats" for details. --default New in 0.15: Fast local operations. Compatible with bzr 0.8 and above when accessed over the network. --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. --dirstate-with-subtree New in 0.15: Fast local operations and improved scaling for network operations. Additionally adds support for versioning nested bzr branches. 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. --weave Pre-0.8 format. Slower than knit and does not support checkouts or shared repositories. --help, -h Show help message. --no-trees Branches in the repository will default to not having a working tree. Alias: init-repo See also: branch, checkout, init, repositories Create a shared repository to hold branches. 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. Examples: 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)

bzr log [LOCATION]

Options: --forward Show from oldest to newest. --help, -h Show help message. --limit N Limit the output to the first N revisions. --log-format ARG Use specified log format. --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. --revision ARG, -r See \'help revisionspec\' for details. --show-ids Show internal object ids. --timezone ARG Display timezone as local, original, or utc. --verbose, -v Show files changed in each revision. Show log of a branch, file, or directory. 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. Examples: 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

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. --non-recursive Don\'t recurse into subdirectories. --null Write an ascii NUL (\0) separator between files rather than a newline. --revision ARG, -r See \'help revisionspec\' for details. --show-ids Show internal object ids. --unknown Print unknown files. --verbose, -v Display more information. --versioned Print versioned files. See also: cat, status List files in a tree.

bzr merge [BRANCH]

Options: --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. --merge-type ARG Select a particular merge algorithm. --diff3 Merge using external diff3 --merge3 Native diff3-style merge --weave Weave-based 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. --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. See also: remerge, status-flags, update Perform a three-way 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. 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

bzr missing [OTHER_BRANCH]

Options: --help, -h Show help message. --log-format ARG Use specified log format. --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. --other Same as --theirs-only. --reverse Reverse the order of revisions. --show-ids Show internal object ids. --theirs-only Display changes in the remote branch only. --this Same as --mine-only. --verbose, -v Display more information. See also: merge, pull Show unmerged/unpulled revisions between two branches. OTHER_BRANCH may be local or remote.

bzr mkdir DIR...

Options: --help, -h Show help message. Create a new versioned directory. This is equivalent to creating the directory and then adding it.

bzr mv [NAMES...]

Options: --after Move only the bzr identifier of the file, because the file has already been moved. --help, -h Show help message. 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 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.

bzr nick [NICKNAME]

Options: --help, -h Show help message. 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.

bzr pack [BRANCH_OR_REPO]

Options: --help, -h Show help message. See also: repositories Compress the data within a repository.

bzr plugins

Options: --help, -h Show help message. List the installed 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.

bzr pull [LOCATION]

Options: --directory ARG, -d Branch to pull into, rather than the one containing the working directory. --help, -h Show help message. --overwrite Ignore differences between branches and overwrite unconditionally. --remember Remember the specified location as a default. --revision ARG, -r See \'help revisionspec\' for details. --verbose, -v Display more information. See also: push, status-flags, update Turn this branch into a mirror of another branch. 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.

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. --remember Remember the specified location as a default. --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 commit that. After that you will be able to do a push without \'--overwrite\'. 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. 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 command 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 potential saving in disk space or performance gain. The branch *MUST* be on a listable system such as local disk or sftp.

bzr remerge [FILE...]

Options: --help, -h Show help message. --merge-type ARG Select a particular merge algorithm. --diff3 Merge using external diff3 --merge3 Native diff3-style merge --weave Weave-based merge --reprocess Reprocess to reduce spurious conflicts. --show-base Show base revision text in conflicts. 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 Don\'t delete any files. --safe Only delete files if they can be safely recovered (default). --help, -h Show help message. --new Remove newly-added files. --verbose, -v Display more information. Alias: rm Remove files or directories. This makes bzr stop tracking changes to the specified files and delete them if they can easily be recovered using revert. You can specify one or more files, and/or --new. If you specify --new, only \'added\' files will be removed. If you specify both, then new files in the specified directories will be removed. If the directories are also new, they will also be removed.

bzr remove-tree [LOCATION]

Options: --help, -h Show help message. 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 renames [DIR]

Options: --help, -h Show help message. See also: status Show list of renamed files.

bzr resolve [FILE...]

Options: --all Resolve all conflicts in this tree. --help, -h Show help message. Alias: resolved 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 encounters 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, resolve FILE to mark a specific conflict as resolved, or "bzr resolve --all" to mark all conflicts as resolved. See also bzr conflicts.

bzr revert [FILE...]

Options: --help, -h Show help message. --no-backup Do not save backups of reverted files. --revision ARG, -r See \'help revisionspec\' for details. 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 \'--revision\', the last committed revision is used. To remove only some changes, without reverting to a prior version, use merge instead. For example, "merge . --r-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 pathname 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 directory will be reverted.

bzr revno [LOCATION]

Options: --help, -h Show help message. See also: info Show current revision number. This is equal to the number of revisions on this branch.

bzr root [FILENAME]

Options: --help, -h Show help message. Show the tree root directory. The root is the nearest enclosing directory with a .bzr control directory.

bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]

Options: --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. --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 directive to this file. --remember Remember submit and public branch. --revision ARG, -r See \'help revisionspec\' for details. See also: merge Create a merge-directive for submiting 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. If --no-bundle is specified, then public_branch is needed (and must be up-to-date), so that the receiver can perform the merge using the public_branch. The public_branch is always included if known, so that people can check it later. The submit branch defaults to the parent, but can be overridden. Both submit branch and public branch will be remembered if supplied. If a public_branch is known for the submit_branch, that public submit branch is used in the merge instructions. This means that a local mirror can be used as your actual submit branch, once you have set public_branch for that mirror. 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 directive format 1. It is compatible with Bazaar 0.12 - 0.18.

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. --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 is 4155. Alias: server Run the bzr server.

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. 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 status [FILE...]

Options: --help, -h Show help message. --revision ARG, -r See \'help revisionspec\' for details. --short Give short SVN-style status lines. --show-ids Show internal object ids. --versioned 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. To see ignored files use \'bzr ignored\'. For details on the changes to file texts, use \'bzr diff\'. --short gives a status flags for each item, similar to the SVN\'s status command. If no arguments are specified, the status of the entire working directory 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. If a revision argument is given, the status is calculated against that revision, or between two revisions if two are provided.

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. --revision ARG, -r See \'help revisionspec\' for details. 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.

bzr tags

Options: --directory ARG, -d Branch whose tags should be displayed. --help, -h Show help message. See also: tag List tags. This tag shows a table of tag names and the revisions they reference.

bzr testament [BRANCH]

Options: --help, -h Show help message. --long Produce long-format testament. --revision ARG, -r See \'help revisionspec\' for details. --strict Produce a strict-format testament. Show testament (signing-form) of a revision.

bzr unbind

Options: --help, -h Show help message. See also: bind, checkouts Convert the current checkout into a regular branch. After unbinding, the local branch is considered independent and subsequent 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. --revision ARG, -r See \'help revisionspec\' for details. --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. In the future, uncommit will create a revision bundle, which can then be re-applied.

bzr update [DIR]

Options: --help, -h Show help message. 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 conflicts. 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.

bzr upgrade [URL]

Options: --format ARG Upgrade to a specific format. See "bzr help formats" for details. --default New in 0.15: Fast local operations. Compatible with bzr 0.8 and above when accessed over the network. --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. --dirstate-with-subtree New in 0.15: Fast local operations and improved scaling for network operations. Additionally adds support for versioning nested bzr branches. 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. --weave Pre-0.8 format. Slower than knit and does not support checkouts or shared repositories. --help, -h Show help message. 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. 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. --help, -h Show help message. --include-file-revisions Include the last revision for each file. --include-history Include the revision-history. Show version information about this tree.

bzr whoami [NAME]

Options: --branch Set identity for the current branch instead of globally. --email Display email address only. --help, -h Show help message. 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>\'

BZRPATH

BZR_EMAIL

EMAIL

BZR_EDITOR

EDITOR

BZR_PLUGIN_PATH

BZR_HOME

~/.bazaar/bazaar.conf