1bzr(1) Bazaar bzr(1)
3
7 bzr - Bazaar next-generation distributed version control
8
10 bzr command [ command_options ]
11 bzr help
12 bzr help command
13
15 Bazaar (or bzr) is a distributed version control system that is power‐
16 ful, friendly, and scalable. Bazaar is a project of Canonical Ltd and
17 part of the GNU Project to develop a free operating system.
18 Bazaar keeps track of changes to software source code (or similar
20 information); lets you explore who changed it, when, and why; merges
21 concurrent changes; and helps people work together in a team.
22
24 bzr add [FILE...]
25 Add specified files or directories.
26 bzr alias [NAME]
28 Set/unset and display aliases.
29 bzr annotate FILENAME
31 Show the origin of each line in a file.
32 bzr bind [LOCATION]
34 Convert the current branch into a checkout of the supplied
35 branch.
36 bzr branch FROM_LOCATION [TO_LOCATION]
38 Create a new branch that is a copy of an existing branch.
39 bzr branches [LOCATION]
41 List the branches available at the current location.
42 bzr break-lock [LOCATION]
44 Break a dead lock.
45 bzr cat FILENAME
47 Write the contents of a file as of a given revision to standard
48 output.
49 bzr check [PATH]
51 Validate working tree structure, branch consistency and reposi‐
52 tory history.
53 bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
55 Create a new checkout of an existing branch.
56 bzr clean-tree
58 Remove unwanted files from working tree.
59 bzr commit [SELECTED...]
61 Commit changes into a new revision.
62 bzr config [NAME]
64 Display, set or remove a configuration option.
65 bzr conflicts
67 List files with conflicts.
68 bzr deleted
70 List files deleted in the working tree.
71 bzr diff [FILE...]
73 Show differences in the working tree, between revisions or
74 branches.
75 bzr dpush [LOCATION]
77 Push into a different VCS without any custom bzr metadata.
78 bzr export DEST [BRANCH_OR_SUBDIR]
80 Export current or past revision to a destination directory or
81 archive.
82 bzr help [TOPIC]
84 Show help on a command or other topic.
85 bzr ignore [NAME_PATTERN...]
87 Ignore specified files or patterns.
88 bzr ignored
90 List ignored files and the patterns that matched them.
91 bzr info [LOCATION]
93 Show information about a working tree, branch or repository.
94 bzr init [LOCATION]
96 Make a directory into a versioned branch.
97 bzr init-repository LOCATION
99 Create a shared repository for branches to share storage space.
100 bzr join TREE
102 Combine a tree into its containing tree.
103 bzr launchpad-login [NAME]
105 Show or set the Launchpad user ID.
106 bzr launchpad-mirror [LOCATION]
108 Ask Launchpad to mirror a branch now.
109 bzr launchpad-open [LOCATION]
111 Open a Launchpad branch page in your web browser.
112 bzr log [FILE...]
114 Show historical log for a branch or subset of a branch.
115 bzr lp-find-proposal
117 Find the proposal to merge this revision.
118 bzr lp-propose-merge [SUBMIT_BRANCH]
120 Propose merging a branch on Launchpad.
121 bzr ls [PATH]
123 List files in a tree.
124 bzr merge [LOCATION]
126 Perform a three-way merge.
127 bzr missing [OTHER_BRANCH]
129 Show unmerged/unpulled revisions between two branches.
130 bzr mkdir DIR...
132 Create a new versioned directory.
133 bzr mv [NAMES...]
135 Move or rename a file.
136 bzr nick [NICKNAME]
138 Print or set the branch nickname.
139 bzr pack [BRANCH_OR_REPO]
141 Compress the data within a repository.
142 bzr ping LOCATION
144 Pings a Bazaar smart server.
145 bzr plugins
147 List the installed plugins.
148 bzr pull [LOCATION]
150 Turn this branch into a mirror of another branch.
151 bzr push [LOCATION]
153 Update a mirror of this branch.
154 bzr reconcile [BRANCH]
156 Reconcile bzr metadata in a branch.
157 bzr reconfigure [LOCATION]
159 Reconfigure the type of a bzr directory.
160 bzr register-branch [PUBLIC_URL]
162 Register a branch with launchpad.net.
163 bzr remerge [FILE...]
165 Redo a merge.
166 bzr remove [FILE...]
168 Remove files or directories.
169 bzr remove-branch [LOCATION]
171 Remove a branch.
172 bzr remove-tree [LOCATION...]
174 Remove the working tree from a given branch/checkout.
175 bzr renames [DIR]
177 Show list of renamed files.
178 bzr resolve [FILE...]
180 Mark a conflict as resolved.
181 bzr revert [FILE...]
183 Set files in the working tree back to the contents of a previous
184 revision.
185 bzr revno [LOCATION]
187 Show current revision number.
188 bzr root [FILENAME]
190 Show the tree root directory.
191 bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
193 Mail or create a merge-directive for submitting changes.
194 bzr serve
196 Run the bzr server.
197 bzr shelve [FILE...]
199 Temporarily set aside some changes from the current tree.
200 bzr sign-my-commits [LOCATION] [COMMITTER]
202 Sign all commits by a given committer.
203 bzr split TREE
205 Split a subdirectory of a tree into a separate tree.
206 bzr status [FILE...]
208 Display status summary.
209 bzr switch [TO_LOCATION]
211 Set the branch of a checkout and update.
212 bzr tag [TAG_NAME]
214 Create, remove or modify a tag naming a revision.
215 bzr tags
217 List tags.
218 bzr testament [BRANCH]
220 Show testament (signing-form) of a revision.
221 bzr unbind
223 Convert the current checkout into a regular branch.
224 bzr uncommit [LOCATION]
226 Remove the last committed revision.
227 bzr unshelve [SHELF_ID]
229 Restore shelved changes.
230 bzr update [DIR]
232 Update a working tree to a new revision.
233 bzr upgrade [URL]
235 Upgrade a repository, branch or working tree to a newer format.
236 bzr verify-signatures [LOCATION]
238 Verify all commit signatures.
239 bzr version
241 Show version of bzr.
242 bzr version-info [LOCATION]
244 Show version information about this tree.
245 bzr view [FILE...]
247 Manage filtered views.
248 bzr whoami [NAME]
250 Show or set bzr user id.
251
253 bzr --help
254 Alias for "help", see "bzr help".
255 bzr -?
257 Alias for "help", see "bzr help".
258 bzr -h
260 Alias for "help", see "bzr help".
261 bzr ?
263 Alias for "help", see "bzr help".
264 bzr add [FILE...]
266 Options:
267 --dry-run Show what would be done, but don't
268 actually do anything.
269 --file-ids-from ARG Lookup file ids from this tree.
270 --help, -h Show help message.
271 --no-recurse, -N Don't recursively add the contents of
272 directories.
273 --quiet, -q Only display errors and warnings.
274 --usage Show usage message and options.
275 --verbose, -v Display more information.
276 See also: ignore, remove
278 Add specified files or directories.
280 In non-recursive mode, all the named items are added, regardless of
282 whether they were previously ignored. A warning is given if any of the
283 named files are already versioned.
284 In recursive mode (the default), files are treated the same way but the
286 behaviour for directories is different. Directories that are already
287 versioned do not give a warning. All directories, whether already ver‐
288 sioned or not, are searched for files or subdirectories that are nei‐
289 ther versioned or ignored, and these are added. This search proceeds
290 recursively into versioned directories. If no names are given '.' is
291 assumed.
292 A warning will be printed when nested trees are encountered, unless
294 they are explicitly ignored.
295 Therefore simply saying 'bzr add' will version all files that are cur‐
297 rently unknown.
298 Adding a file whose parent directory is not versioned will implicitly
300 add the parent, and so on up to the root. This means you should never
301 need to explicitly add a directory, they'll just get added when you add
302 a file in the directory.
303 --dry-run will show which files would be added, but not actually add
305 them.
306 --file-ids-from will try to use the file ids from the supplied path.
308 It looks up ids trying to find a matching parent directory with the
309 same filename, and then by pure path. This option is rarely needed but
310 can be useful when adding the same logical file into two branches that
311 will be merged later (without showing the two different adds as a con‐
312 flict). It is also useful when merging another project into a subdirec‐
313 tory of this one.
314 Any files matching patterns in the ignore list will not be added unless
316 they are explicitly mentioned.
317 In recursive mode, files larger than the configuration option add.maxi‐
319 mum_file_size will be skipped. Named items are never skipped due to
320 file size.
321 bzr alias [NAME]
324 Options:
325 --help, -h Show help message.
326 --quiet, -q Only display errors and warnings.
327 --remove Remove the alias.
328 --usage Show usage message and options.
329 --verbose, -v Display more information.
330 Set/unset and display aliases.
332 Examples:
334 Show the current aliases:
335 bzr alias
337 Show the alias specified for 'll':
339 bzr alias ll
341 Set an alias for 'll':
343 bzr alias ll="log --line -r-10..-1"
345 To remove an alias for 'll':
347 bzr alias --remove ll
349 bzr ann
352 Alias for "annotate", see "bzr annotate".
353 bzr annotate FILENAME
355 Options:
356 --all Show annotations on all lines.
357 --directory ARG, -d Branch to operate on, instead of working
358 directory.
359 --help, -h Show help message.
360 --long Show commit date in annotations.
361 --quiet, -q Only display errors and warnings.
362 --revision ARG, -r See "help revisionspec" for details.
363 --show-ids Show internal object ids.
364 --usage Show usage message and options.
365 --verbose, -v Display more information.
366 Aliases: ann, blame, praise
368 Show the origin of each line in a file.
370 This prints out the given file with an annotation on the left side
372 indicating which revision, author and date introduced the change.
373 If the origin is the same for a run of consecutive lines, it is shown
375 only at the top, unless the --all option is given.
376 bzr bind [LOCATION]
379 Options:
380 --directory ARG, -d Branch to operate on, instead of working
381 directory.
382 --help, -h Show help message.
383 --quiet, -q Only display errors and warnings.
384 --usage Show usage message and options.
385 --verbose, -v Display more information.
386 See also: checkouts, unbind
388 Convert the current branch into a checkout of the supplied branch. If
390 no branch is supplied, rebind to the last bound location.
391 Once converted into a checkout, commits must succeed on the master
393 branch before they will be applied to the local branch.
394 Bound branches use the nickname of its master branch unless it is set
396 locally, in which case binding will update the local nickname to be
397 that of the master.
398 bzr blame
401 Alias for "annotate", see "bzr annotate".
402 bzr branch FROM_LOCATION [TO_LOCATION]
404 Options:
405 --bind Bind new branch to from location.
406 --files-from ARG Get file contents from this tree.
407 --hardlink Hard-link working tree files where
408 possible.
409 --help, -h Show help message.
410 --no-tree Create a branch without a working-tree.
411 --quiet, -q Only display errors and warnings.
412 --revision ARG, -r See "help revisionspec" for details.
413 --stacked Create a stacked branch referring to the
414 source branch. The new branch will
415 depend on the availability of the source
416 branch for all operations.
417 --standalone Do not use a shared repository, even if
418 available.
419 --switch Switch the checkout in the current
420 directory to the new branch.
421 --usage Show usage message and options.
422 --use-existing-dir By default branch will fail if the
423 target directory exists, but does not
424 already have a control directory. This
425 flag will allow branch to proceed.
426 --verbose, -v Display more information.
427 Aliases: get, clone
429 See also: checkout
431 Create a new branch that is a copy of an existing branch.
433 If the TO_LOCATION is omitted, the last component of the FROM_LOCATION
435 will be used. In other words, "branch ../foo/bar" will attempt to cre‐
436 ate ./bar. If the FROM_LOCATION has no / or path separator embedded,
437 the TO_LOCATION is derived from the FROM_LOCATION by stripping a lead‐
438 ing scheme or drive identifier, if any. For example, "branch
439 lp:foo-bar" will attempt to create ./foo-bar.
440 To retrieve the branch as of a particular revision, supply the --revi‐
442 sion parameter, as in "branch foo/bar -r 5".
443 The synonyms 'clone' and 'get' for this command are deprecated.
445 bzr branches [LOCATION]
448 Options:
449 --help, -h Show help message.
450 --quiet, -q Only display errors and warnings.
451 --recursive, -R Recursively scan for branches rather
452 than just looking in the specified
453 location.
454 --usage Show usage message and options.
455 --verbose, -v Display more information.
456 List the branches available at the current location.
458 This command will print the names of all the branches at the current
460 location.
461 bzr break-lock [LOCATION]
464 Options:
465 --config LOCATION is the directory where the
466 config lock is.
467 --force Do not ask for confirmation before
468 breaking the lock.
469 --help, -h Show help message.
470 --quiet, -q Only display errors and warnings.
471 --usage Show usage message and options.
472 --verbose, -v Display more information.
473 Break a dead lock.
475 This command breaks a lock on a repository, branch, working directory
477 or config file.
478 CAUTION: Locks should only be broken when you are sure that the process
480 holding the lock has been stopped.
481 You can get information on what locks are open via the 'bzr info [loca‐
483 tion]' command.
484 Examples:
486 bzr break-lock
487 bzr break-lock bzr+ssh://example.com/bzr/foo
488 bzr break-lock --conf ~/.bazaar
489 bzr cat FILENAME
492 Options:
493 --directory ARG, -d Branch to operate on, instead of working
494 directory.
495 --filters Apply content filters to display the
496 convenience form.
497 --help, -h Show help message.
498 --name-from-revision The path name in the old tree.
499 --quiet, -q Only display errors and warnings.
500 --revision ARG, -r See "help revisionspec" for details.
501 --usage Show usage message and options.
502 --verbose, -v Display more information.
503 See also: ls
505 Write the contents of a file as of a given revision to standard output.
507 If no revision is nominated, the last revision is used.
509 Note: Take care to redirect standard output when using this command on
511 a binary file.
512 bzr check [PATH]
515 Options:
516 --branch Check the branch related to the current
517 directory.
518 --help, -h Show help message.
519 --quiet, -q Only display errors and warnings.
520 --repo Check the repository related to the
521 current directory.
522 --tree Check the working tree related to the
523 current directory.
524 --usage Show usage message and options.
525 --verbose, -v Display more information.
526 See also: reconcile
528 Validate working tree structure, branch consistency and repository his‐
530 tory.
531 This command checks various invariants about branch and repository
533 storage to detect data corruption or bzr bugs.
534 The working tree and branch checks will only give output if a problem
536 is detected. The output fields of the repository check are:
537 revisions
539 This is just the number of revisions checked. It doesn't
540 indicate a problem.
541 versionedfiles
543 This is just the number of versionedfiles checked. It
544 doesn't indicate a problem.
545 unreferenced ancestors
547 Texts that are ancestors of other texts, but
548 are not properly referenced by the revision ancestry. This is a
549 subtle problem that Bazaar can work around.
550 unique file texts
552 This is the total number of unique file contents
553 seen in the checked revisions. It does not indicate a problem.
554 repeated file texts
556 This is the total number of repeated texts seen
557 in the checked revisions. Texts can be repeated when their file
558 entries are modified, but the file contents are not. It does not
559 indicate a problem.
560 If no restrictions are specified, all Bazaar data that is found at the
562 given location will be checked.
563 Examples:
565 Check the tree and branch at 'foo':
567 bzr check --tree --branch foo
569 Check only the repository at 'bar':
571 bzr check --repo bar
573 Check everything at 'baz':
575 bzr check baz
577 bzr checkin
580 Alias for "commit", see "bzr commit".
581 bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
583 Options:
584 --files-from ARG Get file contents from this tree.
585 --hardlink Hard-link working tree files where
586 possible.
587 --help, -h Show help message.
588 --lightweight Perform a lightweight checkout.
589 Lightweight checkouts depend on access
590 to the branch for every operation.
591 Normal checkouts can perform common
592 operations like diff and status without
593 such access, and also support local
594 commits.
595 --quiet, -q Only display errors and warnings.
596 --revision ARG, -r See "help revisionspec" for details.
597 --usage Show usage message and options.
598 --verbose, -v Display more information.
599 Alias: co
601 See also: branch, checkouts, remove-tree, working-trees
603 Create a new checkout of an existing branch.
605 If BRANCH_LOCATION is omitted, checkout will reconstitute a working
607 tree for the branch found in '.'. This is useful if you have removed
608 the working tree or if it was never created - i.e. if you pushed the
609 branch to its current location using SFTP.
610 If the TO_LOCATION is omitted, the last component of the BRANCH_LOCA‐
612 TION will be used. In other words, "checkout ../foo/bar" will attempt
613 to create ./bar. If the BRANCH_LOCATION has no / or path separator
614 embedded, the TO_LOCATION is derived from the BRANCH_LOCATION by strip‐
615 ping a leading scheme or drive identifier, if any. For example, "check‐
616 out lp:foo-bar" will attempt to create ./foo-bar.
617 To retrieve the branch as of a particular revision, supply the --revi‐
619 sion parameter, as in "checkout foo/bar -r 5". Note that this will be
620 immediately out of date [so you cannot commit] but it may be useful
621 (i.e. to examine old code.)
622 bzr ci
625 Alias for "commit", see "bzr commit".
626 bzr clean-tree
628 Options:
629 --detritus Delete conflict files, merge and revert
630 backups, and failed selftest dirs.
631 --directory ARG, -d Branch to operate on, instead of working
632 directory.
633 --dry-run Show files to delete instead of deleting
634 them.
635 --force Do not prompt before deleting.
636 --help, -h Show help message.
637 --ignored Delete all ignored files.
638 --quiet, -q Only display errors and warnings.
639 --unknown Delete files unknown to bzr (default).
640 --usage Show usage message and options.
641 --verbose, -v Display more information.
642 Remove unwanted files from working tree.
644 By default, only unknown files, not ignored files, are deleted. Ver‐
646 sioned files are never deleted.
647 Another class is 'detritus', which includes files emitted by bzr during
649 normal operations and selftests. (The value of these files decreases
650 with time.)
651 If no options are specified, unknown files are deleted. Otherwise,
653 option flags are respected, and may be combined.
654 To check what clean-tree will do, use --dry-run.
656 bzr clone
659 Alias for "branch", see "bzr branch".
660 bzr co
662 Alias for "checkout", see "bzr checkout".
663 bzr commit [SELECTED...]
665 Options:
666 --author ARG Set the author's name, if it's different
667 from the committer.
668 --commit-time ARG Manually set a commit time using commit
669 date format, e.g. '2009-10-10 08:00:00
670 +0100'.
671 --exclude ARG, -x Do not consider changes made to a given
672 path.
673 --file MSGFILE, -F Take commit message from this file.
674 --fixes ARG Mark a bug as being fixed by this
675 revision (see "bzr help bugs").
676 --help, -h Show help message.
677 --local Perform a local commit in a bound
678 branch. Local commits are not pushed to
679 the master branch until a normal commit
680 is performed.
681 --lossy When committing to a foreign version
682 control system do not push data that can
683 not be natively represented.
684 --message ARG, -m Description of the new revision.
685 --quiet, -q Only display errors and warnings.
686 --show-diff, -p When no message is supplied, show the
687 diff along with the status summary in
688 the message editor.
689 --strict Refuse to commit if there are unknown
690 files in the working tree.
691 --unchanged Commit even if nothing has changed.
692 --usage Show usage message and options.
693 --verbose, -v Display more information.
694 Aliases: ci, checkin
696 See also: add, bugs, hooks, uncommit
698 Commit changes into a new revision.
700 An explanatory message needs to be given for each commit. This is often
702 done by using the --message option (getting the message from the com‐
703 mand line) or by using the --file option (getting the message from a
704 file). If neither of these options is given, an editor is opened for
705 the user to enter the message. To see the changed files in the boiler‐
706 plate text loaded into the editor, use the --show-diff option.
707 By default, the entire tree is committed and the person doing the com‐
709 mit is assumed to be the author. These defaults can be overridden as
710 explained below.
711 Selective commits:
713 If selected files are specified, only changes to those files are
715 committed. If a directory is specified then the directory and
716 everything within it is committed.
717 When excludes are given, they take precedence over selected files.
719 For example, to commit only changes within foo, but not changes
720 within foo/bar:
721 bzr commit foo -x foo/bar
723 A selective commit after a merge is not yet supported.
725 Custom authors:
727 If the author of the change is not the same person as the committer,
729 you can specify the author's name using the --author option. The
730 name should be in the same format as a committer-id, e.g.
731 "John Doe <jdoe@example.com>". If there is more than one author of
732 the change you can specify the option multiple times, once for each
733 author.
734 Checks:
736 A common mistake is to forget to add a new file or directory before
738 running the commit command. The --strict option checks for unknown
739 files and aborts the commit if any are found. More advanced pre-com‐
740 mit
741 checks can be implemented by defining hooks. See \*(Aq\*(Aqbzr help
742 hooks\*(Aq\*(Aq
743 for details.
744 Things to note:
746 If you accidentially commit the wrong changes or make a spelling
748 mistake in the commit message say, you can use the uncommit command
749 to undo it. See \*(Aq\*(Aqbzr help uncommit\*(Aq\*(Aq for details.
750 Hooks can also be configured to run after a commit. This allows you
752 to trigger updates to external systems like bug trackers. The --fixes
753 option can be used to record the association between a revision and
754 one or more bugs. See \*(Aq\*(Aqbzr help bugs\*(Aq\*(Aq for details.
755 bzr config [NAME]
758 Options:
759 --all Display all the defined values for the
760 matching options.
761 --directory ARG, -d Branch to operate on, instead of working
762 directory.
763 --help, -h Show help message.
764 --quiet, -q Only display errors and warnings.
765 --remove Remove the option from the configuration
766 file.
767 --scope ARG Reduce the scope to the specified
768 configuration file.
769 --usage Show usage message and options.
770 --verbose, -v Display more information.
771 See also: configuration
773 Display, set or remove a configuration option.
775 Display the active value for option NAME.
777 If --all is specified, NAME is interpreted as a regular expression and
779 all matching options are displayed mentioning their scope and without
780 resolving option references in the value). The active value that bzr
781 will take into account is the first one displayed for each option.
782 If NAME is not given, --all .* is implied (all options are displayed
784 for the current scope).
785 Setting a value is achieved by using NAME=value without spaces. The
787 value is set in the most relevant scope and can be checked by display‐
788 ing the option again.
789 Removing a value is achieved by using --remove NAME.
791 bzr conflicts
794 Options:
795 --directory ARG, -d Branch to operate on, instead of working
796 directory.
797 --help, -h Show help message.
798 --quiet, -q Only display errors and warnings.
799 --text List paths of files with text conflicts.
800 --usage Show usage message and options.
801 --verbose, -v Display more information.
802 See also: conflict-types, resolve
804 List files with conflicts.
806 Merge will do its best to combine the changes in two branches, but
808 there are some kinds of problems only a human can fix. When it encoun‐
809 ters those, it will mark a conflict. A conflict means that you need to
810 fix something, before you can commit.
811 Conflicts normally are listed as short, human-readable messages. If
813 --text is supplied, the pathnames of files with text conflicts are
814 listed, instead. (This is useful for editing all files with text con‐
815 flicts.)
816 Use bzr resolve when you have fixed a problem.
818 bzr del
821 Alias for "remove", see "bzr remove".
822 bzr deleted
824 Options:
825 --directory ARG, -d Branch to operate on, instead of working
826 directory.
827 --help, -h Show help message.
828 --quiet, -q Only display errors and warnings.
829 --show-ids Show internal object ids.
830 --usage Show usage message and options.
831 --verbose, -v Display more information.
832 See also: ls, status
834 List files deleted in the working tree.
836 bzr di
840 Alias for "diff", see "bzr diff".
841 bzr dif
843 Alias for "diff", see "bzr diff".
844 bzr diff [FILE...]
846 Options:
847 --change ARG, -c Select changes introduced by the
848 specified revision. See also "help
849 revisionspec".
850 --context ARG How many lines of context to show.
851 --diff-options ARG Pass these options to the external diff
852 program.
853 --format ARG, -F Diff format to use.
854 --help, -h Show help message.
855 --new ARG Branch/tree to compare to.
856 --old ARG Branch/tree to compare from.
857 --prefix ARG, -p Set prefixes added to old and new
858 filenames, as two values separated by a
859 colon. (eg "old/:new/").
860 --quiet, -q Only display errors and warnings.
861 --revision ARG, -r See "help revisionspec" for details.
862 --usage Show usage message and options.
863 --using ARG Use this command to compare files.
864 --verbose, -v Display more information.
865 Aliases: di, dif
867 See also: status
869 Show differences in the working tree, between revisions or branches.
871 If no arguments are given, all changes for the current tree are listed.
873 If files are given, only the changes in those files are listed. Remote
874 and multiple branches can be compared by using the --old and --new
875 options. If not provided, the default for both is derived from the
876 first argument, if any, or the current tree if no arguments are given.
877 "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and pro‐
879 duces patches suitable for "patch -p1".
880 Note that when using the -r argument with a range of revisions, the
882 differences are computed between the two specified revisions. That is,
883 the command does not show the changes introduced by the first revision
884 in the range. This differs from the interpretation of revision ranges
885 used by "bzr log" which includes the first revision in the range.
886 Exit values:
888 1 - changed
889 2 - unrepresentable changes
890 3 - error
891 0 - no change
892 Examples:
894 Shows the difference in the working tree versus the last commit:
895 bzr diff
897 Difference between the working tree and revision 1:
899 bzr diff -r1
901 Difference between revision 3 and revision 1:
903 bzr diff -r1..3
905 Difference between revision 3 and revision 1 for branch xxx:
907 bzr diff -r1..3 xxx
909 The changes introduced by revision 2 (equivalent to -r1..2):
911 bzr diff -c2
913 To see the changes introduced by revision X:
915 bzr diff -cX
917 Note that in the case of a merge, the -c option shows the changes
919 compared to the left hand parent. To see the changes against
920 another parent, use:
921 bzr diff -r<chosen_parent>..X
923 The changes between the current revision and the previous revision
925 (equivalent to -c-1 and -r-2..-1)
926 bzr diff -r-2..
928 Show just the differences for file NEWS:
930 bzr diff NEWS
932 Show the differences in working tree xxx for file NEWS:
934 bzr diff xxx/NEWS
936 Show the differences from branch xxx to this working tree:
938 bzr diff --old xxx
940 Show the differences between two branches for file NEWS:
942 bzr diff --old xxx --new yyy NEWS
944 Same as 'bzr diff' but prefix paths with old/ and new/:
946 bzr diff --prefix old/:new/
948 Show the differences using a custom diff program with options:
950 bzr diff --using /usr/bin/diff --diff-options -wu
952 bzr dpush [LOCATION]
955 Options:
956 --directory ARG, -d Branch to push from, rather than the one
957 containing the working directory.
958 --help, -h Show help message.
959 --no-rebase Do not rebase after push.
960 --quiet, -q Only display errors and warnings.
961 --remember Remember the specified location as a
962 default.
963 --strict Refuse to push if there are uncommitted
964 changes in the working tree, --no-strict
965 disables the check.
966 --usage Show usage message and options.
967 --verbose, -v Display more information.
968 Push into a different VCS without any custom bzr metadata.
970 This will afterwards rebase the local branch on the remote branch
972 unless the --no-rebase option is used, in which case the two branches
973 will be out of sync after the push.
974 bzr export DEST [BRANCH_OR_SUBDIR]
977 Options:
978 --directory ARG, -d Branch to operate on, instead of working
979 directory.
980 --filters Apply content filters to export the
981 convenient form.
982 --format ARG Type of file to export to.
983 --help, -h Show help message.
984 --per-file-timestamps Set modification time of files to that
985 of the last revision in which it was
986 changed.
987 --quiet, -q Only display errors and warnings.
988 --revision ARG, -r See "help revisionspec" for details.
989 --root ARG Name of the root directory inside the
990 exported file.
991 --uncommitted Export the working tree contents rather
992 than that of the last revision.
993 --usage Show usage message and options.
994 --verbose, -v Display more information.
995 Export current or past revision to a destination directory or archive.
997 If no revision is specified this exports the last committed revision.
999 Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1001 given, try to find the format with the extension. If no extension is
1002 found exports to a directory (equivalent to --format=dir).
1003 If root is supplied, it will be used as the root directory inside con‐
1005 tainer formats (tar, zip, etc). If it is not supplied it will default
1006 to the exported filename. The root option has no effect for 'dir' for‐
1007 mat.
1008 If branch is omitted then the branch containing the current working
1010 directory will be used.
1011 Note: Export of tree with non-ASCII filenames to zip is not supported.
1013 ================= =========================
1015 Supported formats Autodetected by extension
1016 ================= =========================
1017 dir (none)
1018 tar .tar
1019 tbz2 .tar.bz2, .tbz2
1020 tgz .tar.gz, .tgz
1021 zip .zip
1022 ================= =========================
1023 bzr get
1026 Alias for "branch", see "bzr branch".
1027 bzr help [TOPIC]
1029 Options:
1030 --help, -h Show help message.
1031 --long Show help on all commands.
1032 --quiet, -q Only display errors and warnings.
1033 --usage Show usage message and options.
1034 --verbose, -v Display more information.
1035 Aliases: ?, --help, -?, -h
1037 See also: topics
1039 Show help on a command or other topic.
1041 bzr ignore [NAME_PATTERN...]
1045 Options:
1046 --default-rules Display the default ignore rules that
1047 bzr uses.
1048 --directory ARG, -d Branch to operate on, instead of working
1049 directory.
1050 --help, -h Show help message.
1051 --quiet, -q Only display errors and warnings.
1052 --usage Show usage message and options.
1053 --verbose, -v Display more information.
1054 See also: ignored, patterns, status
1056 Ignore specified files or patterns.
1058 See \*(Aq\*(Aqbzr help patterns\*(Aq\*(Aq for details on the syntax of
1060 patterns.
1061 If a .bzrignore file does not exist, the ignore command will create one
1063 and add the specified files or patterns to the newly created file. The
1064 ignore command will also automatically add the .bzrignore file to be
1065 versioned. Creating a .bzrignore file without the use of the ignore
1066 command will require an explicit add command.
1067 To remove patterns from the ignore list, edit the .bzrignore file.
1069 After adding, editing or deleting that file either indirectly by using
1070 this command or directly by using an editor, be sure to commit it.
1071 Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
1073 the global ignore file can be found in the application data directory
1074 as C:\Documents and Settings\<user>\Application Data\Bazaar\2.0\ignore.
1075 Global ignores are not touched by this command. The global ignore file
1076 can be edited directly using an editor.
1077 Patterns prefixed with '!' are exceptions to ignore patterns and take
1079 precedence over regular ignores. Such exceptions are used to specify
1080 files that should be versioned which would otherwise be ignored.
1081 Patterns prefixed with '!!' act as regular ignore patterns, but have
1083 precedence over the '!' exception patterns.
1084 Notes:
1086 * Ignore patterns containing shell wildcards must be quoted from
1088 the shell on Unix.
1089 * Ignore patterns starting with "#" act as comments in the ignore file.
1091 To ignore patterns that begin with that character, use the "RE:" pre‐
1092 fix.
1093 Examples:
1095 Ignore the top level Makefile:
1096 bzr ignore ./Makefile
1098 Ignore .class files in all directories...:
1100 bzr ignore "*.class"
1102 ...but do not ignore "special.class":
1104 bzr ignore "!special.class"
1106 Ignore files whose name begins with the "#" character:
1108 bzr ignore "RE:^#"
1110 Ignore .o files under the lib directory:
1112 bzr ignore "lib/**/*.o"
1114 Ignore .o files under the lib directory:
1116 bzr ignore "RE:lib/.*\.o"
1118 Ignore everything but the "debian" toplevel directory:
1120 bzr ignore "RE:(?!debian/).*"
1122 Ignore everything except the "local" toplevel directory,
1124 but always ignore autosave files ending in ~, even under local/:
1125 bzr ignore "*"
1127 bzr ignore "!./local"
1128 bzr ignore "!!*~"
1129 bzr ignored
1132 Options:
1133 --directory ARG, -d Branch to operate on, instead of working
1134 directory.
1135 --help, -h Show help message.
1136 --quiet, -q Only display errors and warnings.
1137 --usage Show usage message and options.
1138 --verbose, -v Display more information.
1139 See also: ignore, ls
1141 List ignored files and the patterns that matched them.
1143 List all the ignored files and the ignore pattern that caused the file
1145 to be ignored.
1146 Alternatively, to list just the files:
1148 bzr ls --ignored
1150 bzr info [LOCATION]
1153 Options:
1154 --help, -h Show help message.
1155 --quiet, -q Only display errors and warnings.
1156 --usage Show usage message and options.
1157 --verbose, -v Display more information.
1158 See also: repositories, revno, working-trees
1160 Show information about a working tree, branch or repository.
1162 This command will show all known locations and formats associated to
1164 the tree, branch or repository.
1165 In verbose mode, statistical information is included with each report.
1167 To see extended statistic information, use a verbosity level of 2 or
1168 higher by specifying the verbose option multiple times, e.g. -vv.
1169 Branches and working trees will also report any missing revisions.
1171 Examples:
1173 Display information on the format and related locations:
1175 bzr info
1177 Display the above together with extended format information and
1179 basic statistics (like the number of files in the working tree and
1180 number of revisions in the branch and repository):
1181 bzr info -v
1183 Display the above together with number of committers to the branch:
1185 bzr info -vv
1187 bzr init [LOCATION]
1190 Options:
1191 --append-revisions-only Never change revnos or the existing log.
1192 Append revisions to it only.
1193 --create-prefix Create the path leading up to the branch
1194 if it does not already exist.
1195 --format ARG Specify a format for this branch. See
1196 "help formats".
1197 --2a Format for the bzr 2.0 series. Uses
1198 group-compress storage. Provides rich
1199 roots which are a one-way transition.
1200 --default Format for the bzr 2.0 series. Uses
1201 group-compress storage. Provides rich
1202 roots which are a one-way transition.
1203 --development-colo The 2a format with experimental support
1204 for colocated branches.
1205 --pack-0.92 Pack-based format used in 1.x series.
1206 Introduced in 0.92. Interoperates with
1207 bzr repositories before 0.92 but cannot
1208 be read by bzr < 0.92.
1209 --help, -h Show help message.
1210 --no-tree Create a branch without a working tree.
1211 --quiet, -q Only display errors and warnings.
1212 --usage Show usage message and options.
1213 --verbose, -v Display more information.
1214 See also: branch, checkout, init-repository
1216 Make a directory into a versioned branch.
1218 Use this to create an empty branch, or before importing an existing
1220 project.
1221 If there is a repository in a parent directory of the location, then
1223 the history of the branch will be stored in the repository. Otherwise
1224 init creates a standalone branch which carries its own history in the
1225 .bzr directory.
1226 If there is already a branch at the location but it has no working
1228 tree, the tree can be populated with 'bzr checkout'.
1229 Recipe for importing a tree of files:
1231 cd ~/project
1233 bzr init
1234 bzr add .
1235 bzr status
1236 bzr commit -m "imported project"
1237 bzr init-repo
1240 Alias for "init-repository", see "bzr init-repository".
1241 bzr init-repository LOCATION
1243 Options:
1244 --format ARG Specify a format for this repository.
1245 See "bzr help formats" for details.
1246 --2a Format for the bzr 2.0 series. Uses
1247 group-compress storage. Provides rich
1248 roots which are a one-way transition.
1249 --default Format for the bzr 2.0 series. Uses
1250 group-compress storage. Provides rich
1251 roots which are a one-way transition.
1252 --development-colo The 2a format with experimental support
1253 for colocated branches.
1254 --pack-0.92 Pack-based format used in 1.x series.
1255 Introduced in 0.92. Interoperates with
1256 bzr repositories before 0.92 but cannot
1257 be read by bzr < 0.92.
1258 --help, -h Show help message.
1259 --no-trees Branches in the repository will default
1260 to not having a working tree.
1261 --quiet, -q Only display errors and warnings.
1262 --usage Show usage message and options.
1263 --verbose, -v Display more information.
1264 Alias: init-repo
1266 See also: branch, checkout, init, repositories
1268 Create a shared repository for branches to share storage space.
1270 New branches created under the repository directory will store their
1272 revisions in the repository, not in the branch directory. For branches
1273 with shared history, this reduces the amount of storage needed and
1274 speeds up the creation of new branches.
1275 If the --no-trees option is given then the branches in the repository
1277 will not have working trees by default. They will still exist as
1278 directories on disk, but they will not have separate copies of the
1279 files at a certain revision. This can be useful for repositories that
1280 store branches which are interacted with through checkouts or remote
1281 branches, such as on a server.
1282 Examples:
1284 Create a shared repository holding just branches:
1285 bzr init-repo --no-trees repo
1287 bzr init repo/trunk
1288 Make a lightweight checkout elsewhere:
1290 bzr checkout --lightweight repo/trunk trunk-checkout
1292 cd trunk-checkout
1293 (add files here)
1294 bzr join TREE
1297 Options:
1298 --help, -h Show help message.
1299 --quiet, -q Only display errors and warnings.
1300 --usage Show usage message and options.
1301 --verbose, -v Display more information.
1302 See also: split
1304 Combine a tree into its containing tree.
1306 This command requires the target tree to be in a rich-root format.
1308 The TREE argument should be an independent tree, inside another tree,
1310 but not part of it. (Such trees can be produced by "bzr split", but
1311 also by running "bzr branch" with the target inside a tree.)
1312 The result is a combined tree, with the subtree no longer an indepen‐
1314 dent part. This is marked as a merge of the subtree into the contain‐
1315 ing tree, and all history is preserved.
1316 bzr launchpad-login [NAME]
1319 Options:
1320 --help, -h Show help message.
1321 --no-check Don't check that the user name is valid.
1322 --quiet, -q Only display errors and warnings.
1323 --usage Show usage message and options.
1324 --verbose, -v Display more information.
1325 Alias: lp-login
1327 Show or set the Launchpad user ID.
1329 When communicating with Launchpad, some commands need to know your
1331 Launchpad user ID. This command can be used to set or show the user ID
1332 that Bazaar will use for such communication.
1333 Examples:
1335 Show the Launchpad ID of the current user:
1336 bzr launchpad-login
1338 Set the Launchpad ID of the current user to 'bob':
1340 bzr launchpad-login bob
1342 bzr launchpad-mirror [LOCATION]
1345 Options:
1346 --help, -h Show help message.
1347 --quiet, -q Only display errors and warnings.
1348 --usage Show usage message and options.
1349 --verbose, -v Display more information.
1350 Alias: lp-mirror
1352 Ask Launchpad to mirror a branch now.
1354 bzr launchpad-open [LOCATION]
1357 Options:
1358 --dry-run Do not actually open the browser. Just
1359 say the URL we would use.
1360 --help, -h Show help message.
1361 --quiet, -q Only display errors and warnings.
1362 --usage Show usage message and options.
1363 --verbose, -v Display more information.
1364 Alias: lp-open
1366 Open a Launchpad branch page in your web browser.
1368 bzr log [FILE...]
1371 Options:
1372 --authors ARG What names to list as authors - first,
1373 all or committer.
1374 --change ARG, -c Show just the specified revision. See
1375 also "help revisionspec".
1376 --exclude-common-ancestry Display only the revisions that are not
1377 part of both ancestries (require
1378 -rX..Y).
1379 --forward Show from oldest to newest.
1380 --help, -h Show help message.
1381 --include-merged Show merged revisions like --levels 0
1382 does.
1383 --levels N, -n Number of levels to display - 0 for all,
1384 1 for flat.
1385 --limit N, -l Limit the output to the first N
1386 revisions.
1387 --log-format ARG Use specified log format.
1388 --gnu-changelog Format used by GNU ChangeLog files.
1389 --line Log format with one line per revision.
1390 --long Detailed log format.
1391 --short Moderately short log format.
1392 --match ARG, -m Show revisions whose properties match
1393 this expression.
1394 --match-author ARG Show revisions whose authors match this
1395 expression.
1396 --match-bugs ARG Show revisions whose bugs match this
1397 expression.
1398 --match-committer ARG Show revisions whose committer matches
1399 this expression.
1400 --match-message ARG Show revisions whose message matches
1401 this expression.
1402 --omit-merges Do not report commits with more than one
1403 parent.
1404 --quiet, -q Only display errors and warnings.
1405 --revision ARG, -r See "help revisionspec" for details.
1406 --show-diff, -p Show changes made in each revision as a
1407 patch.
1408 --show-ids Show internal object ids.
1409 --signatures Show digital signature validity.
1410 --timezone ARG Display timezone as local, original, or
1411 utc.
1412 --usage Show usage message and options.
1413 --verbose, -v Show files changed in each revision.
1414 See also: log-formats, revisionspec
1416 Show historical log for a branch or subset of a branch.
1418 log is bzr's default tool for exploring the history of a branch. The
1420 branch to use is taken from the first parameter. If no parameters are
1421 given, the branch containing the working directory is logged. Here are
1422 some simple examples:
1423 bzr log log the current branch
1425 bzr log foo.py log a file in its branch
1426 bzr log http://server/branch log a branch on a server
1427 The filtering, ordering and information shown for each revision can be
1429 controlled as explained below. By default, all revisions are shown
1430 sorted (topologically) so that newer revisions appear before older ones
1431 and descendants always appear before ancestors. If displayed, merged
1432 revisions are shown indented under the revision in which they were
1433 merged.
1434 Output control:
1436 The log format controls how information about each revision is
1438 displayed. The standard log formats are called
1439 \*(Aq\*(Aqlong\*(Aq\*(Aq, \*(Aq\*(Aqshort\*(Aq\*(Aq
1440 and \*(Aq\*(Aqline\*(Aq\*(Aq. The default is long. See \*(Aq\*(Aqbzr
1441 help log-formats\*(Aq\*(Aq
1442 for more details on log formats.
1443 The following options can be used to control what information is
1445 displayed:
1446 -l N display a maximum of N revisions
1448 -n N display N levels of revisions (0 for all, 1 for col‐
1449 lapsed)
1450 -v display a status summary (delta) for each revision
1451 -p display a diff (patch) for each revision
1452 --show-ids display revision-ids (and file-ids), not just revnos
1453 Note that the default number of levels to display is a function of
1455 the
1456 log format. If the -n option is not used, the standard log formats
1457 show
1458 just the top level (mainline).
1459 Status summaries are shown using status flags like A, M, etc. To see
1461 the changes explained using words like \*(Aq\*(Aqadded\*(Aq\*(Aq and
1462 \*(Aq\*(Aqmodified\*(Aq\*(Aq
1463 instead, use the -vv option.
1464 Ordering control:
1466 To display revisions from oldest to newest, use the --forward option.
1468 In most cases, using this option will have little impact on the total
1469 time taken to produce a log, though --forward does not incrementally
1470 display revisions like --reverse does when it can.
1471 Revision filtering:
1473 The -r option can be used to specify what revision or range of revi‐
1475 sions
1476 to filter against. The various forms are shown below:
1477 -rX display revision X
1479 -rX.. display revision X and later
1480 -r..Y display up to and including revision Y
1481 -rX..Y display from X to Y inclusive
1482 See \*(Aq\*(Aqbzr help revisionspec\*(Aq\*(Aq for details on how to
1484 specify X and Y.
1485 Some common examples are given below:
1486 -r-1 show just the tip
1488 -r-10.. show the last 10 mainline revisions
1489 -rsubmit:.. show what's new on this branch
1490 -rancestor:path.. show changes since the common ancestor of this
1491 branch and the one at location path
1492 -rdate:yesterday.. show changes since yesterday
1493 When logging a range of revisions using -rX..Y, log starts at
1495 revision Y and searches back in history through the primary
1496 ("left-hand") parents until it finds X. When logging just the
1497 top level (using -n1), an error is reported if X is not found
1498 along the way. If multi-level logging is used (-n0), X may be
1499 a nested merge revision and the log will be truncated accordingly.
1500 Path filtering:
1502 If parameters are given and the first one is not a branch, the log
1504 will be filtered to show only those revisions that changed the
1505 nominated files or directories.
1506 Filenames are interpreted within their historical context. To log a
1508 deleted file, specify a revision range so that the file existed at
1509 the end or start of the range.
1510 Historical context is also important when interpreting pathnames of
1512 renamed files/directories. Consider the following example:
1513 * revision 1: add tutorial.txt
1515 * revision 2: modify tutorial.txt
1516 * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
1517 In this case:
1519 * \*(Aq\*(Aqbzr log guide.txt\*(Aq\*(Aq will log the file added in
1521 revision 1
1522 * \*(Aq\*(Aqbzr log tutorial.txt\*(Aq\*(Aq will log the new file
1524 added in revision 3
1525 * \*(Aq\*(Aqbzr log -r2 -p tutorial.txt\*(Aq\*(Aq will show the
1527 changes made to
1528 the original file in revision 2.
1529 * \*(Aq\*(Aqbzr log -r2 -p guide.txt\*(Aq\*(Aq will display an error
1531 message as there
1532 was no file called guide.txt in revision 2.
1533 Renames are always followed by log. By design, there is no need to
1535 explicitly ask for this (and no way to stop logging a file back
1536 until it was last renamed).
1537 Other filtering:
1539 The --match option can be used for finding revisions that match a
1541 regular expression in a commit message, committer, author or bug.
1542 Specifying the option several times will match any of the supplied
1543 expressions. --match-author, --match-bugs, --match-committer and
1544 --match-message can be used to only match a specific field.
1545 Tips & tricks:
1547 GUI tools and IDEs are often better at exploring history than command
1549 line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
1550 bzr-explorer shell, or the Loggerhead web interface. See the Plugin
1551 Guide <http://doc.bazaar.canonical.com/plugins/en/> and
1552 <http://wiki.bazaar.canonical.com/IDEIntegration>.
1553 You may find it useful to add the aliases below to
1555 \*(Aq\*(Aqbazaar.conf\*(Aq\*(Aq:
1556 [ALIASES]
1558 tip = log -r-1
1559 top = log -l10 --line
1560 show = log -v -p
1561 \*(Aq\*(Aqbzr tip\*(Aq\*(Aq will then show the latest revision while
1563 \*(Aq\*(Aqbzr top\*(Aq\*(Aq
1564 will show the last 10 mainline revisions. To see the details of a
1565 particular revision X, \*(Aq\*(Aqbzr show -rX\*(Aq\*(Aq.
1566 If you are interested in looking deeper into a particular merge X,
1568 use \*(Aq\*(Aqbzr log -n0 -rX\*(Aq\*(Aq.
1569 \*(Aq\*(Aqbzr log -v\*(Aq\*(Aq on a branch with lots of history is
1571 currently
1572 very slow. A fix for this issue is currently under development.
1573 With or without that fix, it is recommended that a revision range
1574 be given when using the -v option.
1575 bzr has a generic full-text matching plugin, bzr-search, that can be
1577 used to find revisions matching user names, commit messages, etc.
1578 Among other features, this plugin can find all revisions containing
1579 a list of words but not others.
1580 When exploring non-mainline history on large projects with deep
1582 history, the performance of log can be greatly improved by installing
1583 the historycache plugin. This plugin buffers historical information
1584 trading disk space for faster speed.
1585 bzr lp-find-proposal
1588 Options:
1589 --help, -h Show help message.
1590 --quiet, -q Only display errors and warnings.
1591 --revision ARG, -r See "help revisionspec" for details.
1592 --usage Show usage message and options.
1593 --verbose, -v Display more information.
1594 Find the proposal to merge this revision.
1596 Finds the merge proposal(s) that discussed landing the specified revi‐
1598 sion. This works only if the if the merged_revno was recorded for the
1599 merge proposal. The proposal(s) are opened in a web browser.
1600 Only the revision specified is searched for. To find the mainline
1602 revision that merged it into mainline, use the "mainline" revision
1603 spec.
1604 So, to find the merge proposal that reviewed line 1 of README:
1606 bzr lp-find-proposal -r mainline:annotate:README:1
1608 bzr lp-login
1611 Alias for "launchpad-login", see "bzr launchpad-login".
1612 bzr lp-mirror
1614 Alias for "launchpad-mirror", see "bzr launchpad-mirror".
1615 bzr lp-open
1617 Alias for "launchpad-open", see "bzr launchpad-open".
1618 bzr lp-propose
1620 Alias for "lp-propose-merge", see "bzr lp-propose-merge".
1621 bzr lp-propose-merge [SUBMIT_BRANCH]
1623 Options:
1624 --approve Mark the proposal as approved
1625 immediately, setting the approved
1626 revision to tip.
1627 --fixes ARG The bug this proposal fixes.
1628 --help, -h Show help message.
1629 --message ARG, -m Commit message.
1630 --quiet, -q Only display errors and warnings.
1631 --review ARG, -R Requested reviewer and optional type.
1632 --staging Propose the merge on staging.
1633 --usage Show usage message and options.
1634 --verbose, -v Display more information.
1635 Aliases: lp-submit, lp-propose
1637 Propose merging a branch on Launchpad.
1639 This will open your usual editor to provide the initial comment. When
1641 it has created the proposal, it will open it in your default web
1642 browser.
1643 The branch will be proposed to merge into SUBMIT_BRANCH. If SUB‐
1645 MIT_BRANCH is not supplied, the remembered submit branch will be used.
1646 If no submit branch is remembered, the development focus will be used.
1647 By default, the SUBMIT_BRANCH's review team will be requested to review
1649 the merge proposal. This can be overriden by specifying --review (-R).
1650 The parameter the launchpad account name of the desired reviewer. This
1651 may optionally be followed by '=' and the review type. For example:
1652 bzr lp-propose-merge --review jrandom --review review-team=qa
1654 This will propose a merge, request "jrandom" to perform a review of
1656 unspecified type, and request "review-team" to perform a "qa" review.
1657 bzr lp-submit
1660 Alias for "lp-propose-merge", see "bzr lp-propose-merge".
1661 bzr ls [PATH]
1663 Options:
1664 --directory ARG, -d Branch to operate on, instead of working
1665 directory.
1666 --from-root Print paths relative to the root of the
1667 branch.
1668 --help, -h Show help message.
1669 --ignored, -i Print ignored files.
1670 --kind ARG, -k List entries of a particular kind: file,
1671 directory, symlink.
1672 --null, -0 Use an ASCII NUL (\0) separator rather
1673 than a newline.
1674 --quiet, -q Only display errors and warnings.
1675 --recursive, -R Recurse into subdirectories.
1676 --revision ARG, -r See "help revisionspec" for details.
1677 --show-ids Show internal object ids.
1678 --unknown, -u Print unknown files.
1679 --usage Show usage message and options.
1680 --verbose, -v Display more information.
1681 --versioned, -V Print versioned files.
1682 See also: cat, status
1684 List files in a tree.
1686 bzr merge [LOCATION]
1690 Options:
1691 --change ARG, -c Select changes introduced by the
1692 specified revision. See also "help
1693 revisionspec".
1694 --directory ARG, -d Branch to merge into, rather than the
1695 one containing the working directory.
1696 --force Merge even if the destination tree has
1697 uncommitted changes.
1698 --help, -h Show help message.
1699 --interactive, -i Select changes interactively.
1700 --merge-type ARG Select a particular merge algorithm.
1701 --diff3 Merge using external diff3.
1702 --lca LCA-newness merge.
1703 --merge3 Native diff3-style merge.
1704 --weave Weave-based merge.
1705 --preview Instead of merging, show a diff of the
1706 merge.
1707 --pull If the destination is already completely
1708 merged into the source, pull from the
1709 source rather than merging. When this
1710 happens, you do not need to commit the
1711 result.
1712 --quiet, -q Only display errors and warnings.
1713 --remember Remember the specified location as a
1714 default.
1715 --reprocess Reprocess to reduce spurious conflicts.
1716 --revision ARG, -r See "help revisionspec" for details.
1717 --show-base Show base revision text in conflicts.
1718 --uncommitted Apply uncommitted changes from a working
1719 copy, instead of branch changes.
1720 --usage Show usage message and options.
1721 --verbose, -v Display more information.
1722 See also: remerge, send, status-flags, update
1724 Perform a three-way merge.
1726 The source of the merge can be specified either in the form of a
1728 branch, or in the form of a path to a file containing a merge directive
1729 generated with bzr send. If neither is specified, the default is the
1730 upstream branch or the branch most recently merged using --remember.
1731 The source of the merge may also be specified in the form of a path to
1732 a file in another branch: in this case, only the modifications to that
1733 file are merged into the current working tree.
1734 When merging from a branch, by default bzr will try to merge in all new
1736 work from the other branch, automatically determining an appropriate
1737 base revision. If this fails, you may need to give an explicit base.
1738 To pick a different ending revision, pass "--revision OTHER". bzr will
1740 try to merge in all new work up to and including revision OTHER.
1741 If you specify two values, "--revision BASE..OTHER", only revisions
1743 BASE through OTHER, excluding BASE but including OTHER, will be merged.
1744 If this causes some revisions to be skipped, i.e. if the destination
1745 branch does not already contain revision BASE, such a merge is commonly
1746 referred to as a "cherrypick". Unlike a normal merge, Bazaar does not
1747 currently track cherrypicks. The changes look like a normal commit, and
1748 the history of the changes from the other branch is not stored in the
1749 commit.
1750 Revision numbers are always relative to the source branch.
1752 Merge will do its best to combine the changes in two branches, but
1754 there are some kinds of problems only a human can fix. When it encoun‐
1755 ters those, it will mark a conflict. A conflict means that you need to
1756 fix something, before you can commit.
1757 Use bzr resolve when you have fixed a problem. See also bzr conflicts.
1759 If there is no default branch set, the first merge will set it (use
1761 --no-remember to avoid setting it). After that, you can omit the branch
1762 to use the default. To change the default, use --remember. The value
1763 will only be saved if the remote location can be accessed.
1764 The results of the merge are placed into the destination working direc‐
1766 tory, where they can be reviewed (with bzr diff), tested, and then com‐
1767 mitted to record the result of the merge.
1768 merge refuses to run if there are any uncommitted changes, unless
1770 --force is given. If --force is given, then the changes from the
1771 source will be merged with the current working tree, including any
1772 uncommitted changes in the tree. The --force option can also be used
1773 to create a merge revision which has more than two parents.
1774 If one would like to merge changes from the working tree of the other
1776 branch without merging any committed revisions, the --uncommitted
1777 option can be given.
1778 To select only some changes to merge, use "merge -i", which will prompt
1780 you to apply each diff hunk and file change, similar to "shelve".
1781 Examples:
1783 To merge all new revisions from bzr.dev:
1784 bzr merge ../bzr.dev
1786 To merge changes up to and including revision 82 from bzr.dev:
1788 bzr merge -r 82 ../bzr.dev
1790 To merge the changes introduced by 82, without previous changes:
1792 bzr merge -r 81..82 ../bzr.dev
1794 To apply a merge directive contained in /tmp/merge:
1796 bzr merge /tmp/merge
1798 To create a merge revision with three parents from two branches
1800 feature1a and feature1b:
1801 bzr merge ../feature1a
1803 bzr merge ../feature1b --force
1804 bzr commit -m 'revision with three parents'
1805 bzr missing [OTHER_BRANCH]
1808 Options:
1809 --directory ARG, -d Branch to operate on, instead of working
1810 directory.
1811 --help, -h Show help message.
1812 --include-merged Show all revisions in addition to the
1813 mainline ones.
1814 --log-format ARG Use specified log format.
1815 --gnu-changelog Format used by GNU ChangeLog files.
1816 --line Log format with one line per revision.
1817 --long Detailed log format.
1818 --short Moderately short log format.
1819 --mine-only Display changes in the local branch
1820 only.
1821 --my-revision ARG Filter on local branch revisions
1822 (inclusive). See "help revisionspec" for
1823 details.
1824 --other Same as --theirs-only.
1825 --quiet, -q Only display errors and warnings.
1826 --reverse Reverse the order of revisions.
1827 --revision ARG, -r Filter on other branch revisions
1828 (inclusive). See "help revisionspec" for
1829 details.
1830 --show-ids Show internal object ids.
1831 --theirs-only Display changes in the remote branch
1832 only.
1833 --this Same as --mine-only.
1834 --usage Show usage message and options.
1835 --verbose, -v Display more information.
1836 See also: merge, pull
1838 Show unmerged/unpulled revisions between two branches.
1840 OTHER_BRANCH may be local or remote.
1842 To filter on a range of revisions, you can use the command -r
1844 begin..end -r revision requests a specific revision, -r ..end or -r
1845 begin.. are also valid.
1846 Exit values:
1848 1 - some missing revisions
1849 0 - no missing revisions
1850 Examples:
1852 Determine the missing revisions between this and the branch at the
1854 remembered pull location:
1855 bzr missing
1857 Determine the missing revisions between this and another branch:
1859 bzr missing http://server/branch
1861 Determine the missing revisions up to a specific revision on the
1863 other
1864 branch:
1865 bzr missing -r ..-10
1867 Determine the missing revisions up to a specific revision on this
1869 branch:
1870 bzr missing --my-revision ..-10
1872 bzr mkdir DIR...
1875 Options:
1876 --help, -h Show help message.
1877 --parents, -p No error if existing, make parent
1878 directories as needed.
1879 --quiet, -q Only display errors and warnings.
1880 --usage Show usage message and options.
1881 --verbose, -v Display more information.
1882 Create a new versioned directory.
1884 This is equivalent to creating the directory and then adding it.
1886 bzr move
1889 Alias for "mv", see "bzr mv".
1890 bzr mv [NAMES...]
1892 Options:
1893 --after Move only the bzr identifier of the
1894 file, because the file has already been
1895 moved.
1896 --auto Automatically guess renames.
1897 --dry-run Avoid making changes when guessing
1898 renames.
1899 --help, -h Show help message.
1900 --quiet, -q Only display errors and warnings.
1901 --usage Show usage message and options.
1902 --verbose, -v Display more information.
1903 Aliases: move, rename
1905 Move or rename a file.
1907 Usage:
1909 bzr mv OLDNAME NEWNAME
1910 bzr mv SOURCE... DESTINATION
1912 If the last argument is a versioned directory, all the other names are
1914 moved into it. Otherwise, there must be exactly two arguments and the
1915 file is changed to a new name.
1916 If OLDNAME does not exist on the filesystem but is versioned and NEW‐
1918 NAME does exist on the filesystem but is not versioned, mv assumes that
1919 the file has been manually moved and only updates its internal inven‐
1920 tory to reflect that change. The same is valid when moving many SOURCE
1921 files to a DESTINATION.
1922 Files cannot be moved between branches.
1924 bzr nick [NICKNAME]
1927 Options:
1928 --directory ARG, -d Branch to operate on, instead of working
1929 directory.
1930 --help, -h Show help message.
1931 --quiet, -q Only display errors and warnings.
1932 --usage Show usage message and options.
1933 --verbose, -v Display more information.
1934 See also: info
1936 Print or set the branch nickname.
1938 If unset, the colocated branch name is used for colocated branches, and
1940 the branch directory name is used for other branches. To print the
1941 current nickname, execute with no argument.
1942 Bound branches use the nickname of its master branch unless it is set
1944 locally.
1945 bzr pack [BRANCH_OR_REPO]
1948 Options:
1949 --clean-obsolete-packs Delete obsolete packs to save disk
1950 space.
1951 --help, -h Show help message.
1952 --quiet, -q Only display errors and warnings.
1953 --usage Show usage message and options.
1954 --verbose, -v Display more information.
1955 See also: repositories
1957 Compress the data within a repository.
1959 This operation compresses the data within a bazaar repository. As
1961 bazaar supports automatic packing of repository, this operation is nor‐
1962 mally not required to be done manually.
1963 During the pack operation, bazaar takes a backup of existing repository
1965 data, i.e. pack files. This backup is eventually removed by bazaar
1966 automatically when it is safe to do so. To save disk space by removing
1967 the backed up pack files, the --clean-obsolete-packs option may be
1968 used.
1969 Warning: If you use --clean-obsolete-packs and your machine crashes
1971 during or immediately after repacking, you may be left with a state
1972 where the deletion has been written to disk but the new packs have not
1973 been. In this case the repository may be unusable.
1974 bzr ping LOCATION
1977 Options:
1978 --help, -h Show help message.
1979 --quiet, -q Only display errors and warnings.
1980 --usage Show usage message and options.
1981 --verbose, -v Display more information.
1982 Pings a Bazaar smart server.
1984 This command sends a 'hello' request to the given location using the
1986 bzr smart protocol, and reports the response.
1987 bzr plugins
1990 Options:
1991 --help, -h Show help message.
1992 --quiet, -q Only display errors and warnings.
1993 --usage Show usage message and options.
1994 --verbose, -v Display more information.
1995 List the installed plugins.
1997 This command displays the list of installed plugins including version
1999 of plugin and a short description of each.
2000 --verbose shows the path where each plugin is located.
2002 A plugin is an external component for Bazaar that extends the revision
2004 control system, by adding or replacing code in Bazaar. Plugins can do
2005 a variety of things, including overriding commands, adding new com‐
2006 mands, providing additional network transports and customizing log out‐
2007 put.
2008 See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plug‐
2010 ins/en/> for further information on plugins including where to find
2011 them and how to install them. Instructions are also provided there on
2012 how to write new plugins using the Python programming language.
2013 bzr praise
2016 Alias for "annotate", see "bzr annotate".
2017 bzr pull [LOCATION]
2019 Options:
2020 --directory ARG, -d Branch to pull into, rather than the one
2021 containing the working directory.
2022 --help, -h Show help message.
2023 --local Perform a local pull in a bound branch.
2024 Local pulls are not applied to the
2025 master branch.
2026 --overwrite Ignore differences between branches and
2027 overwrite unconditionally.
2028 --overwrite-tags Overwrite tags only.
2029 --quiet, -q Only display errors and warnings.
2030 --remember Remember the specified location as a
2031 default.
2032 --revision ARG, -r See "help revisionspec" for details.
2033 --show-base Show base revision text in conflicts.
2034 --usage Show usage message and options.
2035 --verbose, -v Show logs of pulled revisions.
2036 See also: push, send, status-flags, update
2038 Turn this branch into a mirror of another branch.
2040 By default, this command only works on branches that have not diverged.
2042 Branches are considered diverged if the destination branch's most
2043 recent commit is one that has not been merged (directly or indirectly)
2044 into the parent.
2045 If branches have diverged, you can use 'bzr merge' to integrate the
2047 changes from one into the other. Once one branch has merged, the other
2048 should be able to pull it again.
2049 If you want to replace your local changes and just want your branch to
2051 match the remote one, use pull --overwrite. This will work even if the
2052 two branches have diverged.
2053 If there is no default location set, the first pull will set it (use
2055 --no-remember to avoid setting it). After that, you can omit the loca‐
2056 tion to use the default. To change the default, use --remember. The
2057 value will only be saved if the remote location can be accessed.
2058 The --verbose option will display the revisions pulled using the
2060 log_format configuration option. You can use a different format by
2061 overriding it with -Olog_format=<other_format>.
2062 Note: The location can be specified either in the form of a branch, or
2064 in the form of a path to a file containing a merge directive generated
2065 with bzr send.
2066 bzr push [LOCATION]
2069 Options:
2070 --create-prefix Create the path leading up to the branch
2071 if it does not already exist.
2072 --directory ARG, -d Branch to push from, rather than the one
2073 containing the working directory.
2074 --help, -h Show help message.
2075 --no-tree Don't populate the working tree, even
2076 for protocols that support it.
2077 --overwrite Ignore differences between branches and
2078 overwrite unconditionally.
2079 --overwrite-tags Overwrite tags only.
2080 --quiet, -q Only display errors and warnings.
2081 --remember Remember the specified location as a
2082 default.
2083 --revision ARG, -r See "help revisionspec" for details.
2084 --stacked Create a stacked branch that references
2085 the public location of the parent
2086 branch.
2087 --stacked-on ARG Create a stacked branch that refers to
2088 another branch for the commit history.
2089 Only the work not present in the
2090 referenced branch is included in the
2091 branch created.
2092 --strict Refuse to push if there are uncommitted
2093 changes in the working tree, --no-strict
2094 disables the check.
2095 --usage Show usage message and options.
2096 --use-existing-dir By default push will fail if the target
2097 directory exists, but does not already
2098 have a control directory. This flag
2099 will allow push to proceed.
2100 --verbose, -v Display more information.
2101 See also: pull, update, working-trees
2103 Update a mirror of this branch.
2105 The target branch will not have its working tree populated because this
2107 is both expensive, and is not supported on remote file systems.
2108 Some smart servers or protocols *may* put the working tree in place in
2110 the future.
2111 This command only works on branches that have not diverged. Branches
2113 are considered diverged if the destination branch's most recent commit
2114 is one that has not been merged (directly or indirectly) by the source
2115 branch.
2116 If branches have diverged, you can use 'bzr push --overwrite' to
2118 replace the other branch completely, discarding its unmerged changes.
2119 If you want to ensure you have the different changes in the other
2121 branch, do a merge (see bzr help merge) from the other branch, and com‐
2122 mit that. After that you will be able to do a push without '--over‐
2123 write'.
2124 If there is no default push location set, the first push will set it
2126 (use --no-remember to avoid setting it). After that, you can omit the
2127 location to use the default. To change the default, use --remember.
2128 The value will only be saved if the remote location can be accessed.
2129 The --verbose option will display the revisions pushed using the
2131 log_format configuration option. You can use a different format by
2132 overriding it with -Olog_format=<other_format>.
2133 bzr reconcile [BRANCH]
2136 Options:
2137 --help, -h Show help message.
2138 --quiet, -q Only display errors and warnings.
2139 --usage Show usage message and options.
2140 --verbose, -v Display more information.
2141 See also: check
2143 Reconcile bzr metadata in a branch.
2145 This can correct data mismatches that may have been caused by previous
2147 ghost operations or bzr upgrades. You should only need to run this com‐
2148 mand if 'bzr check' or a bzr developer advises you to run it.
2149 If a second branch is provided, cross-branch reconciliation is also
2151 attempted, which will check that data like the tree root id which was
2152 not present in very early bzr versions is represented correctly in both
2153 branches.
2154 At the same time it is run it may recompress data resulting in a poten‐
2156 tial saving in disk space or performance gain.
2157 The branch *MUST* be on a listable system such as local disk or sftp.
2159 bzr reconfigure [LOCATION]
2162 Options:
2163 --bind-to ARG Branch to bind checkout to.
2164 --force Perform reconfiguration even if local
2165 changes will be lost.
2166 --help, -h Show help message.
2167 --quiet, -q Only display errors and warnings.
2168 --repository_trees ARG Whether new branches in the repository
2169 have trees.
2170 --with-no-trees Reconfigure repository to not create
2171 working trees on branches by default.
2172 --with-trees Reconfigure repository to create working
2173 trees on branches by default.
2174 --repository_type ARG Location fo the repository.
2175 --standalone Reconfigure to be a standalone branch
2176 (i.e. stop using shared repository).
2177 --use-shared Reconfigure to use a shared repository.
2178 --stacked-on ARG Reconfigure a branch to be stacked on
2179 another branch.
2180 --tree_type ARG The relation between branch and tree.
2181 --branch Reconfigure to be an unbound branch with
2182 no working tree.
2183 --checkout Reconfigure to be a bound branch with a
2184 working tree.
2185 --lightweight-checkout Reconfigure to be a lightweight checkout
2186 (with no local history).
2187 --tree Reconfigure to be an unbound branch with
2188 a working tree.
2189 --unstacked Reconfigure a branch to be unstacked.
2190 This may require copying substantial
2191 data into it.
2192 --usage Show usage message and options.
2193 --verbose, -v Display more information.
2194 See also: branches, checkouts, standalone-trees, working-trees
2196 Reconfigure the type of a bzr directory.
2198 A target configuration must be specified.
2200 For checkouts, the bind-to location will be auto-detected if not speci‐
2202 fied. The order of preference is 1. For a lightweight checkout, the
2203 current bound location. 2. For branches that used to be checkouts, the
2204 previously-bound location. 3. The push location. 4. The parent loca‐
2205 tion. If none of these is available, --bind-to must be specified.
2206 bzr register-branch [PUBLIC_URL]
2209 Options:
2210 --author ARG Branch author's email address, if not
2211 yourself.
2212 --branch-description ARG Longer description of the purpose or
2213 contents of the branch.
2214 --branch-name ARG Short name for the branch; by default
2215 taken from the last component of the
2216 url.
2217 --branch-title ARG One-sentence description of the branch.
2218 --dry-run Prepare the request but don't actually
2219 send it.
2220 --help, -h Show help message.
2221 --link-bug ARG The bug this branch fixes.
2222 --project ARG Launchpad project short name to
2223 associate with the branch.
2224 --quiet, -q Only display errors and warnings.
2225 --usage Show usage message and options.
2226 --verbose, -v Display more information.
2227 Register a branch with launchpad.net.
2229 This command lists a bzr branch in the directory of branches on launch‐
2231 pad.net. Registration allows the branch to be associated with bugs or
2232 specifications.
2233 Before using this command you must register the project to which the
2235 branch belongs, and create an account for yourself on launchpad.net.
2236 arguments:
2238 public_url: The publicly visible url for the branch to register.
2239 This must be an http or https url (which Launchpad can
2240 read
2241 from to access the branch). Local file urls, SFTP urls,
2242 and
2243 bzr+ssh urls will not work.
2244 If no public_url is provided, bzr will use the config‐
2245 ured
2246 public_url if there is one for the current branch, and
2247 otherwise error.
2248 example:
2250 bzr register-branch http://foo.com/bzr/fooproject.mine \
2251 --project fooproject
2252 bzr remerge [FILE...]
2255 Options:
2256 --help, -h Show help message.
2257 --merge-type ARG Select a particular merge algorithm.
2258 --diff3 Merge using external diff3.
2259 --lca LCA-newness merge.
2260 --merge3 Native diff3-style merge.
2261 --weave Weave-based merge.
2262 --quiet, -q Only display errors and warnings.
2263 --reprocess Reprocess to reduce spurious conflicts.
2264 --show-base Show base revision text in conflicts.
2265 --usage Show usage message and options.
2266 --verbose, -v Display more information.
2267 Redo a merge.
2269 Use this if you want to try a different merge technique while resolving
2271 conflicts. Some merge techniques are better than others, and remerge
2272 lets you try different ones on different files.
2273 The options for remerge have the same meaning and defaults as the ones
2275 for merge. The difference is that remerge can (only) be run when there
2276 is a pending merge, and it lets you specify particular files.
2277 Examples:
2279 Re-do the merge of all conflicted files, and show the base text in
2280 conflict regions, in addition to the usual THIS and OTHER texts:
2281 bzr remerge --show-base
2283 Re-do the merge of "foobar", using the weave merge algorithm, with
2285 additional processing to reduce the size of conflict regions:
2286 bzr remerge --merge-type weave --reprocess foobar
2288 bzr remove [FILE...]
2291 Options:
2292 --file-deletion-strategy ARGThe file deletion mode to be used.
2293 --keep Delete from bzr but leave the working
2294 copy.
2295 --no-backup Don't backup changed files.
2296 --safe Backup changed files (default).
2297 --help, -h Show help message.
2298 --new Only remove files that have never been
2299 committed.
2300 --quiet, -q Only display errors and warnings.
2301 --usage Show usage message and options.
2302 --verbose, -v Display more information.
2303 Aliases: rm, del
2305 Remove files or directories.
2307 This makes Bazaar stop tracking changes to the specified files. Bazaar
2309 will delete them if they can easily be recovered using revert otherwise
2310 they will be backed up (adding an extension of the form .~#~). If no
2311 options or parameters are given Bazaar will scan for files that are
2312 being tracked by Bazaar but missing in your tree and stop tracking them
2313 for you.
2314 bzr remove-branch [LOCATION]
2317 Options:
2318 --directory ARG, -d Branch to operate on, instead of working
2319 directory.
2320 --force Remove branch even if it is the active
2321 branch.
2322 --help, -h Show help message.
2323 --quiet, -q Only display errors and warnings.
2324 --usage Show usage message and options.
2325 --verbose, -v Display more information.
2326 Alias: rmbranch
2328 Remove a branch.
2330 This will remove the branch from the specified location but will keep
2332 any working tree or repository in place.
2333 Examples:
2335 Remove the branch at repo/trunk:
2337 bzr remove-branch repo/trunk
2339 bzr remove-tree [LOCATION...]
2342 Options:
2343 --force Remove the working tree even if it has
2344 uncommitted or shelved changes.
2345 --help, -h Show help message.
2346 --quiet, -q Only display errors and warnings.
2347 --usage Show usage message and options.
2348 --verbose, -v Display more information.
2349 See also: checkout, working-trees
2351 Remove the working tree from a given branch/checkout.
2353 Since a lightweight checkout is little more than a working tree this
2355 will refuse to run against one.
2356 To re-create the working tree, use "bzr checkout".
2358 bzr rename
2361 Alias for "mv", see "bzr mv".
2362 bzr renames [DIR]
2364 Options:
2365 --help, -h Show help message.
2366 --quiet, -q Only display errors and warnings.
2367 --usage Show usage message and options.
2368 --verbose, -v Display more information.
2369 See also: status
2371 Show list of renamed files.
2373 bzr resolve [FILE...]
2377 Options:
2378 --action ARG How to resolve the conflict.
2379 --done Marks the conflict as resolved.
2380 --take-other Resolve the conflict taking the merged
2381 version into account.
2382 --take-this Resolve the conflict preserving the
2383 version in the working tree.
2384 --all Resolve all conflicts in this tree.
2385 --directory ARG, -d Branch to operate on, instead of working
2386 directory.
2387 --help, -h Show help message.
2388 --quiet, -q Only display errors and warnings.
2389 --usage Show usage message and options.
2390 --verbose, -v Display more information.
2391 Alias: resolved
2393 See also: conflicts
2395 Mark a conflict as resolved.
2397 Merge will do its best to combine the changes in two branches, but
2399 there are some kinds of problems only a human can fix. When it encoun‐
2400 ters those, it will mark a conflict. A conflict means that you need to
2401 fix something, before you can commit.
2402 Once you have fixed a problem, use "bzr resolve" to automatically mark
2404 text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict
2405 as resolved, or "bzr resolve --all" to mark all conflicts as resolved.
2406 bzr resolved
2409 Alias for "resolve", see "bzr resolve".
2410 bzr revert [FILE...]
2412 Options:
2413 --forget-merges Remove pending merge marker, without
2414 changing any files.
2415 --help, -h Show help message.
2416 --no-backup Do not save backups of reverted files.
2417 --quiet, -q Only display errors and warnings.
2418 --revision ARG, -r See "help revisionspec" for details.
2419 --usage Show usage message and options.
2420 --verbose, -v Display more information.
2421 See also: cat, export, merge, shelve
2423 Set files in the working tree back to the contents of a previous revi‐
2425 sion.
2426 Giving a list of files will revert only those files. Otherwise, all
2428 files will be reverted. If the revision is not specified with '--revi‐
2429 sion', the working tree basis revision is used. A revert operation
2430 affects only the working tree, not any revision history like the branch
2431 and repository or the working tree basis revision.
2432 To remove only some changes, without reverting to a prior version, use
2434 merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
2435 will remove the changes introduced by the second last commit (-2),
2436 without affecting the changes introduced by the last commit (-1). To
2437 remove certain changes on a hunk-by-hunk basis, see the shelve command.
2438 To update the branch to a specific revision or the latest revision and
2439 update the working tree accordingly while preserving local changes, see
2440 the update command.
2441 Uncommitted changes to files that are reverted will be discarded.
2443 Howver, by default, any files that have been manually changed will be
2444 backed up first. (Files changed only by merge are not backed up.)
2445 Backup files have '.~#~' appended to their name, where # is a number.
2446 When you provide files, you can use their current pathname or the path‐
2448 name from the target revision. So you can use revert to "undelete" a
2449 file by name. If you name a directory, all the contents of that direc‐
2450 tory will be reverted.
2451 If you have newly added files since the target revision, they will be
2453 removed. If the files to be removed have been changed, backups will be
2454 created as above. Directories containing unknown files will not be
2455 deleted.
2456 The working tree contains a list of revisions that have been merged but
2458 not yet committed. These revisions will be included as additional par‐
2459 ents of the next commit. Normally, using revert clears that list as
2460 well as reverting the files. If any files are specified, revert leaves
2461 the list of uncommitted merges alone and reverts only the files. Use
2462 \*(Aq\*(Aqbzr revert.\*(Aq\*(Aq in the tree root to revert all files
2463 but keep the recorded merges, and \*(Aq\*(Aqbzr revert --for‐
2464 get-merges\*(Aq\*(Aq to clear the pending merge list without reverting
2465 any files.
2466 Using "bzr revert --forget-merges", it is possible to apply all of the
2468 changes from a branch in a single revision. To do this, perform the
2469 merge as desired. Then doing revert with the "--forget-merges" option
2470 will keep the content of the tree as it was, but it will clear the list
2471 of pending merges. The next commit will then contain all of the
2472 changes that are present in the other branch, but without any other
2473 parent revisions. Because this technique forgets where these changes
2474 originated, it may cause additional conflicts on later merges involving
2475 the same source and target branches.
2476 bzr revno [LOCATION]
2479 Options:
2480 --help, -h Show help message.
2481 --quiet, -q Only display errors and warnings.
2482 --revision ARG, -r See "help revisionspec" for details.
2483 --tree Show revno of working tree.
2484 --usage Show usage message and options.
2485 --verbose, -v Display more information.
2486 See also: info
2488 Show current revision number.
2490 This is equal to the number of revisions on this branch.
2492 bzr rm
2495 Alias for "remove", see "bzr remove".
2496 bzr rmbranch
2498 Alias for "remove-branch", see "bzr remove-branch".
2499 bzr root [FILENAME]
2501 Options:
2502 --help, -h Show help message.
2503 --quiet, -q Only display errors and warnings.
2504 --usage Show usage message and options.
2505 --verbose, -v Display more information.
2506 Show the tree root directory.
2508 The root is the nearest enclosing directory with a .bzr control direc‐
2510 tory.
2511 bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
2514 Options:
2515 --body ARG Body for the email.
2516 --format ARG Use the specified output format.
2517 --from ARG, -f Branch to generate the submission from,
2518 rather than the one containing the
2519 working directory.
2520 --help, -h Show help message.
2521 --mail-to ARG Mail the request to this address.
2522 --message ARG, -m Message string.
2523 --no-bundle Do not include a bundle in the merge
2524 directive.
2525 --no-patch Do not include a preview patch in the
2526 merge directive.
2527 --output ARG, -o Write merge directive to this file or
2528 directory; use - for stdout.
2529 --quiet, -q Only display errors and warnings.
2530 --remember Remember submit and public branch.
2531 --revision ARG, -r See "help revisionspec" for details.
2532 --strict Refuse to send if there are uncommitted
2533 changes in the working tree, --no-strict
2534 disables the check.
2535 --usage Show usage message and options.
2536 --verbose, -v Display more information.
2537 See also: merge, pull
2539 Mail or create a merge-directive for submitting changes.
2541 A merge directive provides many things needed for requesting merges:
2543 * A machine-readable description of the merge to perform
2545 * An optional patch that is a preview of the changes requested
2547 * An optional bundle of revision data, so that the changes can be
2549 applied
2550 directly from the merge directive, without retrieving data from a
2551 branch.
2552 \*(Aqbzr send\*(Aq creates a compact data set that, when applied using
2554 bzr merge, has the same effect as merging from the source branch.
2555 By default the merge directive is self-contained and can be applied to
2557 any branch containing submit_branch in its ancestory without needing
2558 access to the source branch.
2559 If --no-bundle is specified, then Bazaar doesn't send the contents of
2561 the revisions, but only a structured request to merge from the pub‐
2562 lic_location. In that case the public_branch is needed and it must be
2563 up-to-date and accessible to the recipient. The public_branch is
2564 always included if known, so that people can check it later.
2565 The submit branch defaults to the parent of the source branch, but can
2567 be overridden. Both submit branch and public branch will be remembered
2568 in branch.conf the first time they are used for a particular branch.
2569 The source branch defaults to that containing the working directory,
2570 but can be changed using --from.
2571 Both the submit branch and the public branch follow the usual behavior
2573 with respect to --remember: If there is no default location set, the
2574 first send will set it (use --no-remember to avoid setting it). After
2575 that, you can omit the location to use the default. To change the
2576 default, use --remember. The value will only be saved if the location
2577 can be accessed.
2578 In order to calculate those changes, bzr must analyse the submit
2580 branch. Therefore it is most efficient for the submit branch to be a
2581 local mirror. If a public location is known for the submit_branch,
2582 that location is used in the merge directive.
2583 The default behaviour is to send the merge directive by mail, unless -o
2585 is given, in which case it is sent to a file.
2586 Mail is sent using your preferred mail program. This should be trans‐
2588 parent on Windows (it uses MAPI). On Unix, it requires the xdg-email
2589 utility. If the preferred client can't be found (or used), your editor
2590 will be used.
2591 To use a specific mail program, set the mail_client configuration
2593 option. (For Thunderbird 1.5, this works around some bugs.) Supported
2594 values for specific clients are "claws", "evolution", "kmail",
2595 "mail.app" (MacOS X's Mail.app), "mutt", and "thunderbird"; generic
2596 options are "default", "editor", "emacsclient", "mapi", and
2597 "xdg-email". Plugins may also add supported clients.
2598 If mail is being sent, a to address is required. This can be supplied
2600 either on the commandline, by setting the submit_to configuration
2601 option in the branch itself or the child_submit_to configuration option
2602 in the submit branch.
2603 Two formats are currently supported: "4" uses revision bundle format 4
2605 and merge directive format 2. It is significantly faster and smaller
2606 than older formats. It is compatible with Bazaar 0.19 and later. It
2607 is the default. "0.9" uses revision bundle format 0.9 and merge direc‐
2608 tive format 1. It is compatible with Bazaar 0.12 - 0.18.
2609 The merge directives created by bzr send may be applied using bzr merge
2611 or bzr pull by specifying a file containing a merge directive as the
2612 location.
2613 bzr send makes extensive use of public locations to map local locations
2615 into URLs that can be used by other people. See \*(Aqbzr help configu‐
2616 ration\*(Aq to set them, and use \*(Aqbzr info\*(Aq to display them.
2617 bzr serve
2620 Options:
2621 --allow-writes By default the server is a readonly
2622 server. Supplying --allow-writes
2623 enables write access to the contents of
2624 the served directory and below. Note
2625 that \*(Aq\*(Aqbzr serve\*(Aq\*(Aq does
2626 not perform
2627 authentication, so unless some form of
2628 external authentication is arranged
2629 supplying this option leads to global
2630 uncontrolled write access to your file
2631 system.
2632 --client-timeout ARG Override the default idle client timeout
2633 (5min).
2634 --directory ARG, -d Serve contents of this directory.
2635 --help, -h Show help message.
2636 --inet Serve on stdin/out for use from inetd or
2637 sshd.
2638 --listen ARG Listen for connections on nominated
2639 address.
2640 --port ARG Listen for connections on nominated
2641 port. Passing 0 as the port number will
2642 result in a dynamically allocated port.
2643 The default port depends on the
2644 protocol.
2645 --protocol ARG Protocol to serve.
2646 --bzr The Bazaar smart server protocol over
2647 TCP. (default port: 4155)
2648 --quiet, -q Only display errors and warnings.
2649 --usage Show usage message and options.
2650 --verbose, -v Display more information.
2651 Alias: server
2653 Run the bzr server.
2655 bzr server
2658 Alias for "serve", see "bzr serve".
2659 bzr shelve [FILE...]
2661 Options:
2662 --all Shelve all changes.
2663 --destroy Destroy removed changes instead of
2664 shelving them.
2665 --directory ARG, -d Branch to operate on, instead of working
2666 directory.
2667 --help, -h Show help message.
2668 --list List shelved changes.
2669 --message ARG, -m Message string.
2670 --quiet, -q Only display errors and warnings.
2671 --revision ARG, -r See "help revisionspec" for details.
2672 --usage Show usage message and options.
2673 --verbose, -v Display more information.
2674 --writer ARG Method to use for writing diffs.
2675 --plain Plaintext diff output.
2676 See also: configuration, unshelve
2678 Temporarily set aside some changes from the current tree.
2680 Shelve allows you to temporarily put changes you've made "on the
2682 shelf", ie. out of the way, until a later time when you can bring them
2683 back from the shelf with the 'unshelve' command. The changes are
2684 stored alongside your working tree, and so they aren't propagated along
2685 with your branch nor will they survive its deletion.
2686 If shelve --list is specified, previously-shelved changes are listed.
2688 Shelve is intended to help separate several sets of changes that have
2690 been inappropriately mingled. If you just want to get rid of all
2691 changes and you don't need to restore them later, use revert. If you
2692 want to shelve all text changes at once, use shelve --all.
2693 If filenames are specified, only the changes to those files will be
2695 shelved. Other files will be left untouched.
2696 If a revision is specified, changes since that revision will be
2698 shelved.
2699 You can put multiple items on the shelf, and by default, 'unshelve'
2701 will restore the most recently shelved changes.
2702 For complicated changes, it is possible to edit the changes in a sepa‐
2704 rate editor program to decide what the file remaining in the working
2705 copy should look like. To do this, add the configuration option
2706 change_editor = PROGRAM @new_path @old_path
2708 where @new_path is replaced with the path of the new version of the
2710 file and @old_path is replaced with the path of the old version of the
2711 file. The PROGRAM should save the new file with the desired contents
2712 of the file in the working tree.
2713 bzr sign-my-commits [LOCATION] [COMMITTER]
2717 Options:
2718 --dry-run Don't actually sign anything, just print
2719 the revisions that would be signed.
2720 --help, -h Show help message.
2721 --quiet, -q Only display errors and warnings.
2722 --usage Show usage message and options.
2723 --verbose, -v Display more information.
2724 Sign all commits by a given committer.
2726 If location is not specified the local tree is used. If committer is
2728 not specified the default committer is used.
2729 This does not sign commits that already have signatures.
2731 bzr split TREE
2734 Options:
2735 --help, -h Show help message.
2736 --quiet, -q Only display errors and warnings.
2737 --usage Show usage message and options.
2738 --verbose, -v Display more information.
2739 See also: join
2741 Split a subdirectory of a tree into a separate tree.
2743 This command will produce a target tree in a format that supports rich
2745 roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
2746 converted into earlier formats like 'dirstate-tags'.
2747 The TREE argument should be a subdirectory of a working tree. That
2749 subdirectory will be converted into an independent tree, with its own
2750 branch. Commits in the top-level tree will not apply to the new sub‐
2751 tree.
2752 bzr st
2755 Alias for "status", see "bzr status".
2756 bzr stat
2758 Alias for "status", see "bzr status".
2759 bzr status [FILE...]
2761 Options:
2762 --change ARG, -c Select changes introduced by the
2763 specified revision. See also "help
2764 revisionspec".
2765 --help, -h Show help message.
2766 --no-classify Do not mark object type using indicator.
2767 --no-pending Don't show pending merges.
2768 --quiet, -q Only display errors and warnings.
2769 --revision ARG, -r See "help revisionspec" for details.
2770 --short, -S Use short status indicators.
2771 --show-ids Show internal object ids.
2772 --usage Show usage message and options.
2773 --verbose, -v Display more information.
2774 --versioned, -V Only show versioned files.
2775 Aliases: st, stat
2777 See also: diff, revert, status-flags
2779 Display status summary.
2781 This reports on versioned and unknown files, reporting them grouped by
2783 state. Possible states are:
2784 added
2786 Versioned in the working copy but not in the previous revision.
2787 removed
2789 Versioned in the previous revision but removed or deleted
2790 in the working copy.
2791 renamed
2793 Path of this file changed from the previous revision;
2794 the text may also have changed. This includes files whose
2795 parent directory was renamed.
2796 modified
2798 Text has changed since the previous revision.
2799 kind changed
2801 File kind has been changed (e.g. from file to directory).
2802 unknown
2804 Not versioned and not matching an ignore pattern.
2805 Additionally for directories, symlinks and files with a changed exe‐
2807 cutable bit, Bazaar indicates their type using a trailing character:
2808 '/', '@' or '*' respectively. These decorations can be disabled using
2809 the '--no-classify' option.
2810 To see ignored files use 'bzr ignored'. For details on the changes to
2812 file texts, use 'bzr diff'.
2813 Note that --short or -S gives status flags for each item, similar to
2815 Subversion's status command. To get output similar to svn -q, use bzr
2816 status -SV.
2817 If no arguments are specified, the status of the entire working direc‐
2819 tory is shown. Otherwise, only the status of the specified files or
2820 directories is reported. If a directory is given, status is reported
2821 for everything inside that directory.
2822 Before merges are committed, the pending merge tip revisions are shown.
2824 To see all pending merge revisions, use the -v option. To skip the
2825 display of pending merge information altogether, use the no-pending
2826 option or specify a file/directory.
2827 To compare the working directory to a specific revision, pass a single
2829 revision to the revision argument.
2830 To see which files have changed in a specific revision, or between two
2832 revisions, pass a revision range to the revision argument. This will
2833 produce the same results as calling 'bzr diff --summarize'.
2834 bzr switch [TO_LOCATION]
2837 Options:
2838 --create-branch, -b Create the target branch from this one
2839 before switching to it.
2840 --directory ARG, -d Branch to operate on, instead of working
2841 directory.
2842 --force Switch even if local commits will be
2843 lost.
2844 --help, -h Show help message.
2845 --quiet, -q Only display errors and warnings.
2846 --revision ARG, -r See "help revisionspec" for details.
2847 --store Store and restore uncommitted changes in
2848 the branch.
2849 --usage Show usage message and options.
2850 --verbose, -v Display more information.
2851 Set the branch of a checkout and update.
2853 For lightweight checkouts, this changes the branch being referenced.
2855 For heavyweight checkouts, this checks that there are no local commits
2856 versus the current bound branch, then it makes the local branch a mir‐
2857 ror of the new location and binds to it.
2858 In both cases, the working tree is updated and uncommitted changes are
2860 merged. The user can commit or revert these as they desire.
2861 Pending merges need to be committed or reverted before using switch.
2863 The path to the branch to switch to can be specified relative to the
2865 parent directory of the current branch. For example, if you are cur‐
2866 rently in a checkout of /path/to/branch, specifying 'newbranch' will
2867 find a branch at /path/to/newbranch.
2868 Bound branches use the nickname of its master branch unless it is set
2870 locally, in which case switching will update the local nickname to be
2871 that of the master.
2872 bzr tag [TAG_NAME]
2875 Options:
2876 --delete Delete this tag rather than placing it.
2877 --directory ARG, -d Branch in which to place the tag.
2878 --force Replace existing tags.
2879 --help, -h Show help message.
2880 --quiet, -q Only display errors and warnings.
2881 --revision ARG, -r See "help revisionspec" for details.
2882 --usage Show usage message and options.
2883 --verbose, -v Display more information.
2884 See also: commit, tags
2886 Create, remove or modify a tag naming a revision.
2888 Tags give human-meaningful names to revisions. Commands that take a -r
2890 (--revision) option can be given -rtag:X, where X is any previously
2891 created tag.
2892 Tags are stored in the branch. Tags are copied from one branch to
2894 another along when you branch, push, pull or merge.
2895 It is an error to give a tag name that already exists unless you pass
2897 --force, in which case the tag is moved to point to the new revision.
2898 To rename a tag (change the name but keep it on the same revsion), run
2900 \*(Aq\*(Aqbzr tag new-name -r tag:old-name\*(Aq\*(Aq and then
2901 \*(Aq\*(Aqbzr tag --delete oldname\*(Aq\*(Aq.
2902 If no tag name is specified it will be determined through the 'auto‐
2904 matic_tag_name' hook. This can e.g. be used to automatically tag
2905 upstream releases by reading configure.ac. See \*(Aq\*(Aqbzr help
2906 hooks\*(Aq\*(Aq for details.
2907 bzr tags
2910 Options:
2911 --directory ARG, -d Branch whose tags should be displayed.
2912 --help, -h Show help message.
2913 --quiet, -q Only display errors and warnings.
2914 --revision ARG, -r See "help revisionspec" for details.
2915 --show-ids Show internal object ids.
2916 --sort ARG Sort tags by different criteria.
2917 --usage Show usage message and options.
2918 --verbose, -v Display more information.
2919 See also: tag
2921 List tags.
2923 This command shows a table of tag names and the revisions they refer‐
2925 ence.
2926 bzr testament [BRANCH]
2929 Options:
2930 --help, -h Show help message.
2931 --long Produce long-format testament.
2932 --quiet, -q Only display errors and warnings.
2933 --revision ARG, -r See "help revisionspec" for details.
2934 --strict Produce a strict-format testament.
2935 --usage Show usage message and options.
2936 --verbose, -v Display more information.
2937 Show testament (signing-form) of a revision.
2939 bzr unbind
2942 Options:
2943 --directory ARG, -d Branch to operate on, instead of working
2944 directory.
2945 --help, -h Show help message.
2946 --quiet, -q Only display errors and warnings.
2947 --usage Show usage message and options.
2948 --verbose, -v Display more information.
2949 See also: bind, checkouts
2951 Convert the current checkout into a regular branch.
2953 After unbinding, the local branch is considered independent and subse‐
2955 quent commits will be local only.
2956 bzr uncommit [LOCATION]
2959 Options:
2960 --dry-run Don't actually make changes.
2961 --force Say yes to all questions.
2962 --help, -h Show help message.
2963 --keep-tags Keep tags that point to removed
2964 revisions.
2965 --local Only remove the commits from the local
2966 branch when in a checkout.
2967 --quiet, -q Only display errors and warnings.
2968 --revision ARG, -r See "help revisionspec" for details.
2969 --usage Show usage message and options.
2970 --verbose, -v Display more information.
2971 See also: commit
2973 Remove the last committed revision.
2975 --verbose will print out what is being removed. --dry-run will go
2977 through all the motions, but not actually remove anything.
2978 If --revision is specified, uncommit revisions to leave the branch at
2980 the specified revision. For example, "bzr uncommit -r 15" will leave
2981 the branch at revision 15.
2982 Uncommit leaves the working tree ready for a new commit. The only
2984 change it may make is to restore any pending merges that were present
2985 before the commit.
2986 bzr unshelve [SHELF_ID]
2989 Options:
2990 --action ARG The action to perform.
2991 --apply Apply changes and remove from the shelf.
2992 --delete-only Delete changes without applying them.
2993 --dry-run Show changes, but do not apply or remove
2994 them.
2995 --keep Apply changes but don't delete them.
2996 --preview Instead of unshelving the changes, show
2997 the diff that would result from
2998 unshelving.
2999 --directory ARG, -d Branch to operate on, instead of working
3000 directory.
3001 --help, -h Show help message.
3002 --quiet, -q Only display errors and warnings.
3003 --usage Show usage message and options.
3004 --verbose, -v Display more information.
3005 See also: shelve
3007 Restore shelved changes.
3009 By default, the most recently shelved changes are restored. However if
3011 you specify a shelf by id those changes will be restored instead. This
3012 works best when the changes don't depend on each other.
3013 bzr up
3016 Alias for "update", see "bzr update".
3017 bzr update [DIR]
3019 Options:
3020 --help, -h Show help message.
3021 --quiet, -q Only display errors and warnings.
3022 --revision ARG, -r See "help revisionspec" for details.
3023 --show-base Show base revision text in conflicts.
3024 --usage Show usage message and options.
3025 --verbose, -v Display more information.
3026 Alias: up
3028 See also: pull, status-flags, working-trees
3030 Update a working tree to a new revision.
3032 This will perform a merge of the destination revision (the tip of the
3034 branch, or the specified revision) into the working tree, and then make
3035 that revision the basis revision for the working tree.
3036 You can use this to visit an older revision, or to update a working
3038 tree that is out of date from its branch.
3039 If there are any uncommitted changes in the tree, they will be carried
3041 across and remain as uncommitted changes after the update. To discard
3042 these changes, use 'bzr revert'. The uncommitted changes may conflict
3043 with the changes brought in by the change in basis revision.
3044 If the tree's branch is bound to a master branch, bzr will also update
3046 the branch from the master.
3047 You cannot update just a single file or directory, because each Bazaar
3049 working tree has just a single basis revision. If you want to restore
3050 a file that has been removed locally, use 'bzr revert' instead of 'bzr
3051 update'. If you want to restore a file to its state in a previous
3052 revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to
3053 write out the old content of that file to a new location.
3054 The 'dir' argument, if given, must be the location of the root of a
3056 working tree to update. By default, the working tree that contains the
3057 current working directory is used.
3058 bzr upgrade [URL]
3061 Options:
3062 --clean Remove the backup.bzr directory if
3063 successful.
3064 --dry-run Show what would be done, but don't
3065 actually do anything.
3066 --format ARG Upgrade to a specific format. See "bzr
3067 help formats" for details.
3068 --2a Format for the bzr 2.0 series. Uses
3069 group-compress storage. Provides rich
3070 roots which are a one-way transition.
3071 --default Format for the bzr 2.0 series. Uses
3072 group-compress storage. Provides rich
3073 roots which are a one-way transition.
3074 --development-colo The 2a format with experimental support
3075 for colocated branches.
3076 --pack-0.92 Pack-based format used in 1.x series.
3077 Introduced in 0.92. Interoperates with
3078 bzr repositories before 0.92 but cannot
3079 be read by bzr < 0.92.
3080 --help, -h Show help message.
3081 --quiet, -q Only display errors and warnings.
3082 --usage Show usage message and options.
3083 --verbose, -v Display more information.
3084 See also: check, formats, reconcile
3086 Upgrade a repository, branch or working tree to a newer format.
3088 When the default format has changed after a major new release of
3090 Bazaar, you may be informed during certain operations that you should
3091 upgrade. Upgrading to a newer format may improve performance or make
3092 new features available. It may however limit interoperability with
3093 older repositories or with older versions of Bazaar.
3094 If you wish to upgrade to a particular format rather than the current
3096 default, that can be specified using the --format option. As a conse‐
3097 quence, you can use the upgrade command this way to "downgrade" to an
3098 earlier format, though some conversions are a one way process (e.g.
3099 changing from the 1.x default to the 2.x default) so downgrading is not
3100 always possible.
3101 A backup.bzr.~#~ directory is created at the start of the conversion
3103 process (where # is a number). By default, this is left there on com‐
3104 pletion. If the conversion fails, delete the new .bzr directory and
3105 rename this one back in its place. Use the --clean option to ask for
3106 the backup.bzr directory to be removed on successful conversion.
3107 Alternatively, you can delete it by hand if everything looks good
3108 afterwards.
3109 If the location given is a shared repository, dependent branches are
3111 also converted provided the repository converts successfully. If the
3112 conversion of a branch fails, remaining branches are still tried.
3113 For more information on upgrades, see the Bazaar Upgrade Guide,
3115 http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3116 bzr verify-signatures [LOCATION]
3119 Options:
3120 --acceptable-keys ARG, -k Comma separated list of GPG key patterns
3121 which are acceptable for verification.
3122 --help, -h Show help message.
3123 --quiet, -q Only display errors and warnings.
3124 --revision ARG, -r See "help revisionspec" for details.
3125 --usage Show usage message and options.
3126 --verbose, -v Display more information.
3127 Verify all commit signatures.
3129 Verifies that all commits in the branch are signed by known GnuPG keys.
3131 bzr version
3134 Options:
3135 --help, -h Show help message.
3136 --quiet, -q Only display errors and warnings.
3137 --short Print just the version number.
3138 --usage Show usage message and options.
3139 --verbose, -v Display more information.
3140 Show version of bzr.
3142 bzr version-info [LOCATION]
3145 Options:
3146 --all Include all possible information.
3147 --check-clean Check if tree is clean.
3148 --format ARG Select the output format.
3149 --custom Version info in Custom template-based
3150 format.
3151 --python Version info in Python format.
3152 --rio Version info in RIO (simple text) format
3153 (default).
3154 --help, -h Show help message.
3155 --include-file-revisions Include the last revision for each file.
3156 --include-history Include the revision-history.
3157 --quiet, -q Only display errors and warnings.
3158 --revision ARG, -r See "help revisionspec" for details.
3159 --template ARG Template for the output.
3160 --usage Show usage message and options.
3161 --verbose, -v Display more information.
3162 Show version information about this tree.
3164 You can use this command to add information about version into source
3166 code of an application. The output can be in one of the supported for‐
3167 mats or in a custom format based on a template.
3168 For example:
3170 bzr version-info --custom \
3172 --template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n"
3173 will produce a C header file with formatted string containing the cur‐
3175 rent revision number. Other supported variables in templates are:
3176 * {date} - date of the last revision
3178 * {build_date} - current date
3179 * {revno} - revision number
3180 * {revision_id} - revision id
3181 * {branch_nick} - branch nickname
3182 * {clean} - 0 if the source tree contains uncommitted changes,
3183 otherwise 1
3184 bzr view [FILE...]
3187 Options:
3188 --all Apply list or delete action to all
3189 views.
3190 --delete Delete the view.
3191 --help, -h Show help message.
3192 --name ARG Name of the view to define, list or
3193 delete.
3194 --quiet, -q Only display errors and warnings.
3195 --switch ARG Name of the view to switch to.
3196 --usage Show usage message and options.
3197 --verbose, -v Display more information.
3198 Manage filtered views.
3200 Views provide a mask over the tree so that users can focus on a subset
3202 of a tree when doing their work. After creating a view, commands that
3203 support a list of files - status, diff, commit, etc - effectively have
3204 that list of files implicitly given each time. An explicit list of
3205 files can still be given but those files must be within the current
3206 view.
3207 In most cases, a view has a short life-span: it is created to make a
3209 selected change and is deleted once that change is committed. At other
3210 times, you may wish to create one or more named views and switch
3211 between them.
3212 To disable the current view without deleting it, you can switch to the
3214 pseudo view called \*(Aq\*(Aqoff\*(Aq\*(Aq. This can be useful when you
3215 need to see the whole tree for an operation or two (e.g. merge) but
3216 want to switch back to your view after that.
3217 Examples:
3219 To define the current view:
3220 bzr view file1 dir1 ...
3222 To list the current view:
3224 bzr view
3226 To delete the current view:
3228 bzr view --delete
3230 To disable the current view without deleting it:
3232 bzr view --switch off
3234 To define a named view and switch to it:
3236 bzr view --name view-name file1 dir1 ...
3238 To list a named view:
3240 bzr view --name view-name
3242 To delete a named view:
3244 bzr view --name view-name --delete
3246 To switch to a named view:
3248 bzr view --switch view-name
3250 To list all views defined:
3252 bzr view --all
3254 To delete all views:
3256 bzr view --delete --all
3258 bzr whoami [NAME]
3261 Options:
3262 --branch Set identity for the current branch
3263 instead of globally.
3264 --directory ARG, -d Branch to operate on, instead of working
3265 directory.
3266 --email Display email address only.
3267 --help, -h Show help message.
3268 --quiet, -q Only display errors and warnings.
3269 --usage Show usage message and options.
3270 --verbose, -v Display more information.
3271 Show or set bzr user id.
3273 Examples:
3275 Show the email of the current user:
3276 bzr whoami --email
3278 Set the current user:
3280 bzr whoami "Frank Chu <fchu@example.com>"
3282
3285 BZRPATH
3286 Path where bzr is to look for shell plugin external commands.
3287 BZR_EMAIL
3289 E-Mail address of the user. Overrides EMAIL.
3290 EMAIL E-Mail address of the user.
3292 BZR_EDITOR
3294 Editor for editing commit messages. Overrides EDITOR.
3295 EDITOR Editor for editing commit messages.
3297 BZR_PLUGIN_PATH
3299 Paths where bzr should look for plugins.
3300 BZR_DISABLE_PLUGINS
3302 Plugins that bzr should not load.
3303 BZR_PLUGINS_AT
3305 Plugins to load from a directory not in BZR_PLUGIN_PATH.
3306 BZR_HOME
3308 Directory holding .bazaar config dir. Overrides HOME.
3309 BZR_HOME (Win32)
3311 Directory holding bazaar config dir. Overrides APPDATA and HOME.
3312 BZR_REMOTE_PATH
3314 Full name of remote 'bzr' command (for bzr+ssh:// URLs).
3315 BZR_SSH
3317 Path to SSH client, or one of paramiko, openssh, sshcorp, plink
3318 or lsh.
3319 BZR_LOG
3321 Location of .bzr.log (use '/dev/null' to suppress log).
3322 BZR_LOG (Win32)
3324 Location of .bzr.log (use 'NUL' to suppress log).
3325 BZR_COLUMNS
3327 Override implicit terminal width.
3328 BZR_CONCURRENCY
3330 Number of processes that can be run concurrently (selftest)
3331 BZR_PROGRESS_BAR
3333 Override the progress display. Values are 'none' or 'text'.
3334 BZR_PDB
3336 Control whether to launch a debugger on error.
3337 BZR_SIGQUIT_PDB
3339 Control whether SIGQUIT behaves normally or invokes a breakin
3340 debugger.
3341 BZR_TEXTUI_INPUT
3343 Force console input mode for prompts to line-based (instead of
3344 char-based).
3345
3347 ~/.bazaar/bazaar.conf
3348 Contains the user's default configuration. The section [DEFAULT]
3349 is used to define general configuration that will be applied
3350 everywhere. The section [ALIASES] can be used to create command
3351 aliases for commonly used options.
3352 A typical config file might look something like:
3354 [DEFAULT]
3356 email=John Doe <jdoe@isp.com>
3357 [ALIASES]
3358 commit = commit --strict
3359 log10 = log --short -r -10..-1
3360
3362 http://bazaar.canonical.com/
33632.7.0 2019-02-12 bzr(1)