1bzr(1) Bazaar bzr(1)
2
6 bzr - Bazaar next-generation distributed version control
7
9 bzr command [ command_options ]
10 bzr help
11 bzr help command
12
14 Bazaar (or bzr) is a distributed version control system that is power‐
15 ful, friendly, and scalable. Bazaar is a project of Canonical Ltd and
16 part of the GNU Project to develop a free operating system.
17 Bazaar keeps track of changes to software source code (or similar
19 information); lets you explore who changed it, when, and why; merges
20 concurrent changes; and helps people work together in a team.
21
23 bzr add [FILE...]
24 Add specified files or directories.
25 bzr alias [NAME]
27 Set/unset and display aliases.
28 bzr annotate FILENAME
30 Show the origin of each line in a file.
31 bzr bind [LOCATION]
33 Convert the current branch into a checkout of the supplied
34 branch.
35 bzr branch FROM_LOCATION [TO_LOCATION]
37 Create a new branch that is a copy of an existing branch.
38 bzr branches [LOCATION]
40 List the branches available at the current location.
41 bzr break-lock [LOCATION]
43 Break a dead lock.
44 bzr cat FILENAME
46 Write the contents of a file as of a given revision to standard
47 output.
48 bzr check [PATH]
50 Validate working tree structure, branch consistency and reposi‐
51 tory history.
52 bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
54 Create a new checkout of an existing branch.
55 bzr clean-tree
57 Remove unwanted files from working tree.
58 bzr commit [SELECTED...]
60 Commit changes into a new revision.
61 bzr config [NAME]
63 Display, set or remove a configuration option.
64 bzr conflicts
66 List files with conflicts.
67 bzr deleted
69 List files deleted in the working tree.
70 bzr diff [FILE...]
72 Show differences in the working tree, between revisions or
73 branches.
74 bzr dpush [LOCATION]
76 Push into a different VCS without any custom bzr metadata.
77 bzr export DEST [BRANCH_OR_SUBDIR]
79 Export current or past revision to a destination directory or
80 archive.
81 bzr help [TOPIC]
83 Show help on a command or other topic.
84 bzr ignore [NAME_PATTERN...]
86 Ignore specified files or patterns.
87 bzr ignored
89 List ignored files and the patterns that matched them.
90 bzr info [LOCATION]
92 Show information about a working tree, branch or repository.
93 bzr init [LOCATION]
95 Make a directory into a versioned branch.
96 bzr init-repository LOCATION
98 Create a shared repository for branches to share storage space.
99 bzr join TREE
101 Combine a tree into its containing tree.
102 bzr log [FILE...]
104 Show historical log for a branch or subset of a branch.
105 bzr ls [PATH]
107 List files in a tree.
108 bzr merge [LOCATION]
110 Perform a three-way merge.
111 bzr missing [OTHER_BRANCH]
113 Show unmerged/unpulled revisions between two branches.
114 bzr mkdir DIR...
116 Create a new versioned directory.
117 bzr mv [NAMES...]
119 Move or rename a file.
120 bzr nick [NICKNAME]
122 Print or set the branch nickname.
123 bzr pack [BRANCH_OR_REPO]
125 Compress the data within a repository.
126 bzr plugins
128 List the installed plugins.
129 bzr pull [LOCATION]
131 Turn this branch into a mirror of another branch.
132 bzr push [LOCATION]
134 Update a mirror of this branch.
135 bzr reconcile [BRANCH]
137 Reconcile bzr metadata in a branch.
138 bzr reconfigure [LOCATION]
140 Reconfigure the type of a bzr directory.
141 bzr remerge [FILE...]
143 Redo a merge.
144 bzr remove [FILE...]
146 Remove files or directories.
147 bzr remove-branch [LOCATION]
149 Remove a branch.
150 bzr remove-tree [LOCATION...]
152 Remove the working tree from a given branch/checkout.
153 bzr renames [DIR]
155 Show list of renamed files.
156 bzr resolve [FILE...]
158 Mark a conflict as resolved.
159 bzr revert [FILE...]
161 Revert files to a previous revision.
162 bzr revno [LOCATION]
164 Show current revision number.
165 bzr root [FILENAME]
167 Show the tree root directory.
168 bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
170 Mail or create a merge-directive for submitting changes.
171 bzr serve
173 Run the bzr server.
174 bzr shelve [FILE...]
176 Temporarily set aside some changes from the current tree.
177 bzr sign-my-commits [LOCATION] [COMMITTER]
179 Sign all commits by a given committer.
180 bzr split TREE
182 Split a subdirectory of a tree into a separate tree.
183 bzr status [FILE...]
185 Display status summary.
186 bzr switch [TO_LOCATION]
188 Set the branch of a checkout and update.
189 bzr tag [TAG_NAME]
191 Create, remove or modify a tag naming a revision.
192 bzr tags
194 List tags.
195 bzr testament [BRANCH]
197 Show testament (signing-form) of a revision.
198 bzr unbind
200 Convert the current checkout into a regular branch.
201 bzr uncommit [LOCATION]
203 Remove the last committed revision.
204 bzr unshelve [SHELF_ID]
206 Restore shelved changes.
207 bzr update [DIR]
209 Update a working tree to a new revision.
210 bzr upgrade [URL]
212 Upgrade a repository, branch or working tree to a newer format.
213 bzr verify-signatures [LOCATION]
215 Verify all commit signatures.
216 bzr version
218 Show version of bzr.
219 bzr version-info [LOCATION]
221 Show version information about this tree.
222 bzr view [FILE...]
224 Manage filtered views.
225 bzr whoami [NAME]
227 Show or set bzr user id.
228
230 bzr --help
231 Alias for "help", see "bzr help".
232 bzr -?
234 Alias for "help", see "bzr help".
235 bzr -h
237 Alias for "help", see "bzr help".
238 bzr ?
240 Alias for "help", see "bzr help".
241 bzr add [FILE...]
243 Options:
244 --dry-run Show what would be done, but don´t
245 actually do anything.
246 --file-ids-from ARG Lookup file ids from this tree.
247 --help, -h Show help message.
248 --no-recurse Don´t recursively add the contents of
249 directories.
250 --quiet, -q Only display errors and warnings.
251 --usage Show usage message and options.
252 --verbose, -v Display more information.
253 See also: ignore, remove
255 Add specified files or directories.
257 In non-recursive mode, all the named items are added, regardless of
259 whether they were previously ignored. A warning is given if any of the
260 named files are already versioned.
261 In recursive mode (the default), files are treated the same way but the
263 behaviour for directories is different. Directories that are already
264 versioned do not give a warning. All directories, whether already ver‐
265 sioned or not, are searched for files or subdirectories that are nei‐
266 ther versioned or ignored, and these are added. This search proceeds
267 recursively into versioned directories. If no names are given ´.´ is
268 assumed.
269 A warning will be printed when nested trees are encountered, unless
271 they are explicitly ignored.
272 Therefore simply saying ´bzr add´ will version all files that are cur‐
274 rently unknown.
275 Adding a file whose parent directory is not versioned will implicitly
277 add the parent, and so on up to the root. This means you should never
278 need to explicitly add a directory, they´ll just get added when you add
279 a file in the directory.
280 --dry-run will show which files would be added, but not actually add
282 them.
283 --file-ids-from will try to use the file ids from the supplied path.
285 It looks up ids trying to find a matching parent directory with the
286 same filename, and then by pure path. This option is rarely needed but
287 can be useful when adding the same logical file into two branches that
288 will be merged later (without showing the two different adds as a con‐
289 flict). It is also useful when merging another project into a subdirec‐
290 tory of this one.
291 Any files matching patterns in the ignore list will not be added unless
293 they are explicitly mentioned.
294 In recursive mode, files larger than the configuration option add.maxi‐
296 mum_file_size will be skipped. Named items are never skipped due to
297 file size.
298 bzr alias [NAME]
301 Options:
302 --help, -h Show help message.
303 --quiet, -q Only display errors and warnings.
304 --remove Remove the alias.
305 --usage Show usage message and options.
306 --verbose, -v Display more information.
307 Set/unset and display aliases.
309 Examples:
311 Show the current aliases:
312 bzr alias
314 Show the alias specified for ´ll´:
316 bzr alias ll
318 Set an alias for ´ll´:
320 bzr alias ll="log --line -r-10..-1"
322 To remove an alias for ´ll´:
324 bzr alias --remove ll
326 bzr ann
329 Alias for "annotate", see "bzr annotate".
330 bzr annotate FILENAME
332 Options:
333 --all Show annotations on all lines.
334 --directory ARG, -d Branch to operate on, instead of working
335 directory.
336 --help, -h Show help message.
337 --long Show commit date in annotations.
338 --quiet, -q Only display errors and warnings.
339 --revision ARG, -r See "help revisionspec" for details.
340 --show-ids Show internal object ids.
341 --usage Show usage message and options.
342 --verbose, -v Display more information.
343 Aliases: ann, blame, praise
345 Show the origin of each line in a file.
347 This prints out the given file with an annotation on the left side
349 indicating which revision, author and date introduced the change.
350 If the origin is the same for a run of consecutive lines, it is shown
352 only at the top, unless the --all option is given.
353 bzr bind [LOCATION]
356 Options:
357 --directory ARG, -d Branch to operate on, instead of working
358 directory.
359 --help, -h Show help message.
360 --quiet, -q Only display errors and warnings.
361 --usage Show usage message and options.
362 --verbose, -v Display more information.
363 See also: checkouts, unbind
365 Convert the current branch into a checkout of the supplied branch. If
367 no branch is supplied, rebind to the last bound location.
368 Once converted into a checkout, commits must succeed on the master
370 branch before they will be applied to the local branch.
371 Bound branches use the nickname of its master branch unless it is set
373 locally, in which case binding will update the local nickname to be
374 that of the master.
375 bzr blame
378 Alias for "annotate", see "bzr annotate".
379 bzr branch FROM_LOCATION [TO_LOCATION]
381 Options:
382 --bind Bind new branch to from location.
383 --files-from ARG Get file contents from this tree.
384 --hardlink Hard-link working tree files where
385 possible.
386 --help, -h Show help message.
387 --no-tree Create a branch without a working-tree.
388 --quiet, -q Only display errors and warnings.
389 --revision ARG, -r See "help revisionspec" for details.
390 --stacked Create a stacked branch referring to the
391 source branch. The new branch will
392 depend on the availability of the source
393 branch for all operations.
394 --standalone Do not use a shared repository, even if
395 available.
396 --switch Switch the checkout in the current
397 directory to the new branch.
398 --usage Show usage message and options.
399 --use-existing-dir By default branch will fail if the
400 target directory exists, but does not
401 already have a control directory. This
402 flag will allow branch to proceed.
403 --verbose, -v Display more information.
404 Aliases: get, clone
406 See also: checkout
408 Create a new branch that is a copy of an existing branch.
410 If the TO_LOCATION is omitted, the last component of the FROM_LOCATION
412 will be used. In other words, "branch ../foo/bar" will attempt to cre‐
413 ate ./bar. If the FROM_LOCATION has no / or path separator embedded,
414 the TO_LOCATION is derived from the FROM_LOCATION by stripping a lead‐
415 ing scheme or drive identifier, if any. For example, "branch
416 lp:foo-bar" will attempt to create ./foo-bar.
417 To retrieve the branch as of a particular revision, supply the --revi‐
419 sion parameter, as in "branch foo/bar -r 5".
420 The synonyms ´clone´ and ´get´ for this command are deprecated.
422 bzr branches [LOCATION]
425 Options:
426 --help, -h Show help message.
427 --quiet, -q Only display errors and warnings.
428 --recursive, -R Recursively scan for branches rather
429 than just looking in the specified
430 location.
431 --usage Show usage message and options.
432 --verbose, -v Display more information.
433 List the branches available at the current location.
435 This command will print the names of all the branches at the current
437 location.
438 bzr break-lock [LOCATION]
441 Options:
442 --config LOCATION is the directory where the
443 config lock is.
444 --force Do not ask for confirmation before
445 breaking the lock.
446 --help, -h Show help message.
447 --quiet, -q Only display errors and warnings.
448 --usage Show usage message and options.
449 --verbose, -v Display more information.
450 Break a dead lock.
452 This command breaks a lock on a repository, branch, working directory
454 or config file.
455 CAUTION: Locks should only be broken when you are sure that the process
457 holding the lock has been stopped.
458 You can get information on what locks are open via the ´bzr info [loca‐
460 tion]´ command.
461 Examples:
463 bzr break-lock
464 bzr break-lock bzr+ssh://example.com/bzr/foo
465 bzr break-lock --conf ~/.bazaar
466 bzr cat FILENAME
469 Options:
470 --directory ARG, -d Branch to operate on, instead of working
471 directory.
472 --filters Apply content filters to display the
473 convenience form.
474 --help, -h Show help message.
475 --name-from-revision The path name in the old tree.
476 --quiet, -q Only display errors and warnings.
477 --revision ARG, -r See "help revisionspec" for details.
478 --usage Show usage message and options.
479 --verbose, -v Display more information.
480 See also: ls
482 Write the contents of a file as of a given revision to standard output.
484 If no revision is nominated, the last revision is used.
486 Note: Take care to redirect standard output when using this command on
488 a binary file.
489 bzr check [PATH]
492 Options:
493 --branch Check the branch related to the current
494 directory.
495 --help, -h Show help message.
496 --quiet, -q Only display errors and warnings.
497 --repo Check the repository related to the
498 current directory.
499 --tree Check the working tree related to the
500 current directory.
501 --usage Show usage message and options.
502 --verbose, -v Display more information.
503 See also: reconcile
505 Validate working tree structure, branch consistency and repository his‐
507 tory.
508 This command checks various invariants about branch and repository
510 storage to detect data corruption or bzr bugs.
511 The working tree and branch checks will only give output if a problem
513 is detected. The output fields of the repository check are:
514 revisions
516 This is just the number of revisions checked. It doesn´t
517 indicate a problem.
518 versionedfiles
520 This is just the number of versionedfiles checked. It
521 doesn´t indicate a problem.
522 unreferenced ancestors
524 Texts that are ancestors of other texts, but
525 are not properly referenced by the revision ancestry. This is a
526 subtle problem that Bazaar can work around.
527 unique file texts
529 This is the total number of unique file contents
530 seen in the checked revisions. It does not indicate a problem.
531 repeated file texts
533 This is the total number of repeated texts seen
534 in the checked revisions. Texts can be repeated when their file
535 entries are modified, but the file contents are not. It does not
536 indicate a problem.
537 If no restrictions are specified, all Bazaar data that is found at the
539 given location will be checked.
540 Examples:
542 Check the tree and branch at ´foo´:
544 bzr check --tree --branch foo
546 Check only the repository at ´bar´:
548 bzr check --repo bar
550 Check everything at ´baz´:
552 bzr check baz
554 bzr checkin
557 Alias for "commit", see "bzr commit".
558 bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
560 Options:
561 --files-from ARG Get file contents from this tree.
562 --hardlink Hard-link working tree files where
563 possible.
564 --help, -h Show help message.
565 --lightweight Perform a lightweight checkout.
566 Lightweight checkouts depend on access
567 to the branch for every operation.
568 Normal checkouts can perform common
569 operations like diff and status without
570 such access, and also support local
571 commits.
572 --quiet, -q Only display errors and warnings.
573 --revision ARG, -r See "help revisionspec" for details.
574 --usage Show usage message and options.
575 --verbose, -v Display more information.
576 Alias: co
578 See also: branch, checkouts
580 Create a new checkout of an existing branch.
582 If BRANCH_LOCATION is omitted, checkout will reconstitute a working
584 tree for the branch found in ´.´. This is useful if you have removed
585 the working tree or if it was never created - i.e. if you pushed the
586 branch to its current location using SFTP.
587 If the TO_LOCATION is omitted, the last component of the BRANCH_LOCA‐
589 TION will be used. In other words, "checkout ../foo/bar" will attempt
590 to create ./bar. If the BRANCH_LOCATION has no / or path separator
591 embedded, the TO_LOCATION is derived from the BRANCH_LOCATION by strip‐
592 ping a leading scheme or drive identifier, if any. For example, "check‐
593 out lp:foo-bar" will attempt to create ./foo-bar.
594 To retrieve the branch as of a particular revision, supply the --revi‐
596 sion parameter, as in "checkout foo/bar -r 5". Note that this will be
597 immediately out of date [so you cannot commit] but it may be useful
598 (i.e. to examine old code.)
599 bzr ci
602 Alias for "commit", see "bzr commit".
603 bzr clean-tree
605 Options:
606 --detritus Delete conflict files, merge and revert
607 backups, and failed selftest dirs.
608 --directory ARG, -d Branch to operate on, instead of working
609 directory.
610 --dry-run Show files to delete instead of deleting
611 them.
612 --force Do not prompt before deleting.
613 --help, -h Show help message.
614 --ignored Delete all ignored files.
615 --quiet, -q Only display errors and warnings.
616 --unknown Delete files unknown to bzr (default).
617 --usage Show usage message and options.
618 --verbose, -v Display more information.
619 Remove unwanted files from working tree.
621 By default, only unknown files, not ignored files, are deleted. Ver‐
623 sioned files are never deleted.
624 Another class is ´detritus´, which includes files emitted by bzr during
626 normal operations and selftests. (The value of these files decreases
627 with time.)
628 If no options are specified, unknown files are deleted. Otherwise,
630 option flags are respected, and may be combined.
631 To check what clean-tree will do, use --dry-run.
633 bzr clone
636 Alias for "branch", see "bzr branch".
637 bzr co
639 Alias for "checkout", see "bzr checkout".
640 bzr commit [SELECTED...]
642 Options:
643 --author ARG Set the author´s name, if it´s different
644 from the committer.
645 --commit-time ARG Manually set a commit time using commit
646 date format, e.g. ´2009-10-10 08:00:00
647 +0100´.
648 --exclude ARG, -x Do not consider changes made to a given
649 path.
650 --file MSGFILE, -F Take commit message from this file.
651 --fixes ARG Mark a bug as being fixed by this
652 revision (see "bzr help bugs").
653 --help, -h Show help message.
654 --local Perform a local commit in a bound
655 branch. Local commits are not pushed to
656 the master branch until a normal commit
657 is performed.
658 --lossy When committing to a foreign version
659 control system do not push data that can
660 not be natively represented.
661 --message ARG, -m Description of the new revision.
662 --quiet, -q Only display errors and warnings.
663 --show-diff, -p When no message is supplied, show the
664 diff along with the status summary in
665 the message editor.
666 --strict Refuse to commit if there are unknown
667 files in the working tree.
668 --unchanged Commit even if nothing has changed.
669 --usage Show usage message and options.
670 --verbose, -v Display more information.
671 Aliases: ci, checkin
673 See also: add, bugs, hooks, uncommit
675 Commit changes into a new revision.
677 An explanatory message needs to be given for each commit. This is often
679 done by using the --message option (getting the message from the com‐
680 mand line) or by using the --file option (getting the message from a
681 file). If neither of these options is given, an editor is opened for
682 the user to enter the message. To see the changed files in the boiler‐
683 plate text loaded into the editor, use the --show-diff option.
684 By default, the entire tree is committed and the person doing the com‐
686 mit is assumed to be the author. These defaults can be overridden as
687 explained below.
688 Selective commits:
690 If selected files are specified, only changes to those files are
692 committed. If a directory is specified then the directory and
693 everything within it is committed.
694 When excludes are given, they take precedence over selected files.
696 For example, to commit only changes within foo, but not changes
697 within foo/bar:
698 bzr commit foo -x foo/bar
700 A selective commit after a merge is not yet supported.
702 Custom authors:
704 If the author of the change is not the same person as the committer,
706 you can specify the author´s name using the --author option. The
707 name should be in the same format as a committer-id, e.g.
708 "John Doe <jdoe@example.com>". If there is more than one author of
709 the change you can specify the option multiple times, once for each
710 author.
711 Checks:
713 A common mistake is to forget to add a new file or directory before
715 running the commit command. The --strict option checks for unknown
716 files and aborts the commit if any are found. More advanced pre-com‐
717 mit
718 checks can be implemented by defining hooks. See ``bzr help hooks``
719 for details.
720 Things to note:
722 If you accidentially commit the wrong changes or make a spelling
724 mistake in the commit message say, you can use the uncommit command
725 to undo it. See ``bzr help uncommit`` for details.
726 Hooks can also be configured to run after a commit. This allows you
728 to trigger updates to external systems like bug trackers. The --fixes
729 option can be used to record the association between a revision and
730 one or more bugs. See ``bzr help bugs`` for details.
731 bzr config [NAME]
734 Options:
735 --all Display all the defined values for the
736 matching options.
737 --directory ARG, -d Branch to operate on, instead of working
738 directory.
739 --help, -h Show help message.
740 --quiet, -q Only display errors and warnings.
741 --remove Remove the option from the configuration
742 file.
743 --scope ARG Reduce the scope to the specified
744 configuration file.
745 --usage Show usage message and options.
746 --verbose, -v Display more information.
747 See also: configuration
749 Display, set or remove a configuration option.
751 Display the active value for a given option.
753 If --all is specified, NAME is interpreted as a regular expression and
755 all matching options are displayed mentioning their scope. The active
756 value that bzr will take into account is the first one displayed for
757 each option.
758 If no NAME is given, --all .* is implied.
760 Setting a value is achieved by using name=value without spaces. The
762 value is set in the most relevant scope and can be checked by display‐
763 ing the option again.
764 bzr conflicts
767 Options:
768 --directory ARG, -d Branch to operate on, instead of working
769 directory.
770 --help, -h Show help message.
771 --quiet, -q Only display errors and warnings.
772 --text List paths of files with text conflicts.
773 --usage Show usage message and options.
774 --verbose, -v Display more information.
775 See also: conflict-types, resolve
777 List files with conflicts.
779 Merge will do its best to combine the changes in two branches, but
781 there are some kinds of problems only a human can fix. When it encoun‐
782 ters those, it will mark a conflict. A conflict means that you need to
783 fix something, before you can commit.
784 Conflicts normally are listed as short, human-readable messages. If
786 --text is supplied, the pathnames of files with text conflicts are
787 listed, instead. (This is useful for editing all files with text con‐
788 flicts.)
789 Use bzr resolve when you have fixed a problem.
791 bzr del
794 Alias for "remove", see "bzr remove".
795 bzr deleted
797 Options:
798 --directory ARG, -d Branch to operate on, instead of working
799 directory.
800 --help, -h Show help message.
801 --quiet, -q Only display errors and warnings.
802 --show-ids Show internal object ids.
803 --usage Show usage message and options.
804 --verbose, -v Display more information.
805 See also: ls, status
807 List files deleted in the working tree.
809 bzr di
813 Alias for "diff", see "bzr diff".
814 bzr dif
816 Alias for "diff", see "bzr diff".
817 bzr diff [FILE...]
819 Options:
820 --change ARG, -c Select changes introduced by the
821 specified revision. See also "help
822 revisionspec".
823 --diff-options ARG Pass these options to the external diff
824 program.
825 --format ARG, -F Diff format to use.
826 --help, -h Show help message.
827 --new ARG Branch/tree to compare to.
828 --old ARG Branch/tree to compare from.
829 --prefix ARG, -p Set prefixes added to old and new
830 filenames, as two values separated by a
831 colon. (eg "old/:new/").
832 --quiet, -q Only display errors and warnings.
833 --revision ARG, -r See "help revisionspec" for details.
834 --usage Show usage message and options.
835 --using ARG Use this command to compare files.
836 --verbose, -v Display more information.
837 Aliases: di, dif
839 See also: status
841 Show differences in the working tree, between revisions or branches.
843 If no arguments are given, all changes for the current tree are listed.
845 If files are given, only the changes in those files are listed. Remote
846 and multiple branches can be compared by using the --old and --new
847 options. If not provided, the default for both is derived from the
848 first argument, if any, or the current tree if no arguments are given.
849 "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and pro‐
851 duces patches suitable for "patch -p1".
852 Note that when using the -r argument with a range of revisions, the
854 differences are computed between the two specified revisions. That is,
855 the command does not show the changes introduced by the first revision
856 in the range. This differs from the interpretation of revision ranges
857 used by "bzr log" which includes the first revision in the range.
858 Exit values:
860 1 - changed
861 2 - unrepresentable changes
862 3 - error
863 0 - no change
864 Examples:
866 Shows the difference in the working tree versus the last commit:
867 bzr diff
869 Difference between the working tree and revision 1:
871 bzr diff -r1
873 Difference between revision 3 and revision 1:
875 bzr diff -r1..3
877 Difference between revision 3 and revision 1 for branch xxx:
879 bzr diff -r1..3 xxx
881 The changes introduced by revision 2 (equivalent to -r1..2):
883 bzr diff -c2
885 To see the changes introduced by revision X:
887 bzr diff -cX
889 Note that in the case of a merge, the -c option shows the changes
891 compared to the left hand parent. To see the changes against
892 another parent, use:
893 bzr diff -r<chosen_parent>..X
895 The changes between the current revision and the previous revision
897 (equivalent to -c-1 and -r-2..-1)
898 bzr diff -r-2..
900 Show just the differences for file NEWS:
902 bzr diff NEWS
904 Show the differences in working tree xxx for file NEWS:
906 bzr diff xxx/NEWS
908 Show the differences from branch xxx to this working tree:
910 bzr diff --old xxx
912 Show the differences between two branches for file NEWS:
914 bzr diff --old xxx --new yyy NEWS
916 Same as ´bzr diff´ but prefix paths with old/ and new/:
918 bzr diff --prefix old/:new/
920 Show the differences using a custom diff program with options:
922 bzr diff --using /usr/bin/diff --diff-options -wu
924 bzr dpush [LOCATION]
927 Options:
928 --directory ARG, -d Branch to push from, rather than the one
929 containing the working directory.
930 --help, -h Show help message.
931 --no-rebase Do not rebase after push.
932 --quiet, -q Only display errors and warnings.
933 --remember Remember the specified location as a
934 default.
935 --strict Refuse to push if there are uncommitted
936 changes in the working tree, --no-strict
937 disables the check.
938 --usage Show usage message and options.
939 --verbose, -v Display more information.
940 Push into a different VCS without any custom bzr metadata.
942 This will afterwards rebase the local branch on the remote branch
944 unless the --no-rebase option is used, in which case the two branches
945 will be out of sync after the push.
946 bzr export DEST [BRANCH_OR_SUBDIR]
949 Options:
950 --directory ARG, -d Branch to operate on, instead of working
951 directory.
952 --filters Apply content filters to export the
953 convenient form.
954 --format ARG Type of file to export to.
955 --help, -h Show help message.
956 --per-file-timestamps Set modification time of files to that
957 of the last revision in which it was
958 changed.
959 --quiet, -q Only display errors and warnings.
960 --revision ARG, -r See "help revisionspec" for details.
961 --root ARG Name of the root directory inside the
962 exported file.
963 --uncommitted Export the working tree contents rather
964 than that of the last revision.
965 --usage Show usage message and options.
966 --verbose, -v Display more information.
967 Export current or past revision to a destination directory or archive.
969 If no revision is specified this exports the last committed revision.
971 Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
973 given, try to find the format with the extension. If no extension is
974 found exports to a directory (equivalent to --format=dir).
975 If root is supplied, it will be used as the root directory inside con‐
977 tainer formats (tar, zip, etc). If it is not supplied it will default
978 to the exported filename. The root option has no effect for ´dir´ for‐
979 mat.
980 If branch is omitted then the branch containing the current working
982 directory will be used.
983 Note: Export of tree with non-ASCII filenames to zip is not supported.
985 ================= =========================
987 Supported formats Autodetected by extension
988 ================= =========================
989 dir (none)
990 tar .tar
991 tbz2 .tar.bz2, .tbz2
992 tgz .tar.gz, .tgz
993 zip .zip
994 ================= =========================
995 bzr get
998 Alias for "branch", see "bzr branch".
999 bzr help [TOPIC]
1001 Options:
1002 --help, -h Show help message.
1003 --long Show help on all commands.
1004 --quiet, -q Only display errors and warnings.
1005 --usage Show usage message and options.
1006 --verbose, -v Display more information.
1007 Aliases: ?, --help, -?, -h
1009 See also: topics
1011 Show help on a command or other topic.
1013 bzr ignore [NAME_PATTERN...]
1017 Options:
1018 --default-rules Display the default ignore rules that
1019 bzr uses.
1020 --directory ARG, -d Branch to operate on, instead of working
1021 directory.
1022 --help, -h Show help message.
1023 --quiet, -q Only display errors and warnings.
1024 --usage Show usage message and options.
1025 --verbose, -v Display more information.
1026 See also: ignored, patterns, status
1028 Ignore specified files or patterns.
1030 See ``bzr help patterns`` for details on the syntax of patterns.
1032 If a .bzrignore file does not exist, the ignore command will create one
1034 and add the specified files or patterns to the newly created file. The
1035 ignore command will also automatically add the the use of the ignore
1036 command will require an explicit add command.
1037 To remove patterns from the ignore list, edit the .bzrignore file.
1039 After adding, editing or deleting that file either indirectly by using
1040 this command or directly by using an editor, be sure to commit it.
1041 Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
1043 the global ignore file can be found in the application data directory
1044 as C:\Documents and Settings\<user>\Application Data\Bazaar\2.0\ignore.
1045 Global ignores are not touched by this command. The global ignore file
1046 can be edited directly using an editor.
1047 Patterns prefixed with ´!´ are exceptions to ignore patterns and take
1049 precedence over regular ignores. Such exceptions are used to specify
1050 files that should be versioned which would otherwise be ignored.
1051 Patterns prefixed with ´!!´ act as regular ignore patterns, but have
1053 precedence over the ´!´ exception patterns.
1054 Notes:
1056 * Ignore patterns containing shell wildcards must be quoted from
1058 the shell on Unix.
1059 * Ignore patterns starting with "#" act as comments in the ignore file.
1061 To ignore patterns that begin with that character, use the "RE:" pre‐
1062 fix.
1063 Examples:
1065 Ignore the top level Makefile:
1066 bzr ignore ./Makefile
1068 Ignore .class files in all directories...:
1070 bzr ignore "*.class"
1072 ...but do not ignore "special.class":
1074 bzr ignore "!special.class"
1076 Ignore files whose name begins with the "#" character:
1078 bzr ignore "RE:^#"
1080 Ignore .o files under the lib directory:
1082 bzr ignore "lib/**/*.o"
1084 Ignore .o files under the lib directory:
1086 bzr ignore "RE:lib/.*\.o"
1088 Ignore everything but the "debian" toplevel directory:
1090 bzr ignore "RE:(?!debian/).*"
1092 Ignore everything except the "local" toplevel directory,
1094 but always ignore autosave files ending in ~, even under local/:
1095 bzr ignore "*"
1097 bzr ignore "!./local"
1098 bzr ignore "!!*~"
1099 bzr ignored
1102 Options:
1103 --directory ARG, -d Branch to operate on, instead of working
1104 directory.
1105 --help, -h Show help message.
1106 --quiet, -q Only display errors and warnings.
1107 --usage Show usage message and options.
1108 --verbose, -v Display more information.
1109 See also: ignore, ls
1111 List ignored files and the patterns that matched them.
1113 List all the ignored files and the ignore pattern that caused the file
1115 to be ignored.
1116 Alternatively, to list just the files:
1118 bzr ls --ignored
1120 bzr info [LOCATION]
1123 Options:
1124 --help, -h Show help message.
1125 --quiet, -q Only display errors and warnings.
1126 --usage Show usage message and options.
1127 --verbose, -v Display more information.
1128 See also: repositories, revno, working-trees
1130 Show information about a working tree, branch or repository.
1132 This command will show all known locations and formats associated to
1134 the tree, branch or repository.
1135 In verbose mode, statistical information is included with each report.
1137 To see extended statistic information, use a verbosity level of 2 or
1138 higher by specifying the verbose option multiple times, e.g. -vv.
1139 Branches and working trees will also report any missing revisions.
1141 Examples:
1143 Display information on the format and related locations:
1145 bzr info
1147 Display the above together with extended format information and
1149 basic statistics (like the number of files in the working tree and
1150 number of revisions in the branch and repository):
1151 bzr info -v
1153 Display the above together with number of committers to the branch:
1155 bzr info -vv
1157 bzr init [LOCATION]
1160 Options:
1161 --append-revisions-only Never change revnos or the existing log.
1162 Append revisions to it only.
1163 --create-prefix Create the path leading up to the branch
1164 if it does not already exist.
1165 --format ARG Specify a format for this branch. See
1166 "help formats".
1167 --2a Format for the bzr 2.0 series. Uses
1168 group-compress storage. Provides rich
1169 roots which are a one-way transition.
1170 --default Format for the bzr 2.0 series. Uses
1171 group-compress storage. Provides rich
1172 roots which are a one-way transition.
1173 --development-colo The 2a format with experimental support
1174 for colocated branches.
1175 --pack-0.92 Pack-based format used in 1.x series.
1176 Introduced in 0.92. Interoperates with
1177 bzr repositories before 0.92 but cannot
1178 be read by bzr < 0.92.
1179 --help, -h Show help message.
1180 --no-tree Create a branch without a working tree.
1181 --quiet, -q Only display errors and warnings.
1182 --usage Show usage message and options.
1183 --verbose, -v Display more information.
1184 See also: branch, checkout, init-repository
1186 Make a directory into a versioned branch.
1188 Use this to create an empty branch, or before importing an existing
1190 project.
1191 If there is a repository in a parent directory of the location, then
1193 the history of the branch will be stored in the repository. Otherwise
1194 init creates a standalone branch which carries its own history in the
1195 .bzr directory.
1196 If there is already a branch at the location but it has no working
1198 tree, the tree can be populated with ´bzr checkout´.
1199 Recipe for importing a tree of files:
1201 cd ~/project
1203 bzr init
1204 bzr add .
1205 bzr status
1206 bzr commit -m "imported project"
1207 bzr init-repo
1210 Alias for "init-repository", see "bzr init-repository".
1211 bzr init-repository LOCATION
1213 Options:
1214 --format ARG Specify a format for this repository.
1215 See "bzr help formats" for details.
1216 --2a Format for the bzr 2.0 series. Uses
1217 group-compress storage. Provides rich
1218 roots which are a one-way transition.
1219 --default Format for the bzr 2.0 series. Uses
1220 group-compress storage. Provides rich
1221 roots which are a one-way transition.
1222 --development-colo The 2a format with experimental support
1223 for colocated branches.
1224 --pack-0.92 Pack-based format used in 1.x series.
1225 Introduced in 0.92. Interoperates with
1226 bzr repositories before 0.92 but cannot
1227 be read by bzr < 0.92.
1228 --help, -h Show help message.
1229 --no-trees Branches in the repository will default
1230 to not having a working tree.
1231 --quiet, -q Only display errors and warnings.
1232 --usage Show usage message and options.
1233 --verbose, -v Display more information.
1234 Alias: init-repo
1236 See also: branch, checkout, init, repositories
1238 Create a shared repository for branches to share storage space.
1240 New branches created under the repository directory will store their
1242 revisions in the repository, not in the branch directory. For branches
1243 with shared history, this reduces the amount of storage needed and
1244 speeds up the creation of new branches.
1245 If the --no-trees option is given then the branches in the repository
1247 will not have working trees by default. They will still exist as
1248 directories on disk, but they will not have separate copies of the
1249 files at a certain revision. This can be useful for repositories that
1250 store branches which are interacted with through checkouts or remote
1251 branches, such as on a server.
1252 Examples:
1254 Create a shared repository holding just branches:
1255 bzr init-repo --no-trees repo
1257 bzr init repo/trunk
1258 Make a lightweight checkout elsewhere:
1260 bzr checkout --lightweight repo/trunk trunk-checkout
1262 cd trunk-checkout
1263 (add files here)
1264 bzr join TREE
1267 Options:
1268 --help, -h Show help message.
1269 --quiet, -q Only display errors and warnings.
1270 --usage Show usage message and options.
1271 --verbose, -v Display more information.
1272 See also: split
1274 Combine a tree into its containing tree.
1276 This command requires the target tree to be in a rich-root format.
1278 The TREE argument should be an independent tree, inside another tree,
1280 but not part of it. (Such trees can be produced by "bzr split", but
1281 also by running "bzr branch" with the target inside a tree.)
1282 The result is a combined tree, with the subtree no longer an indepen‐
1284 dent part. This is marked as a merge of the subtree into the contain‐
1285 ing tree, and all history is preserved.
1286 bzr log [FILE...]
1289 Options:
1290 --authors ARG What names to list as authors - first,
1291 all or committer.
1292 --change ARG, -c Show just the specified revision. See
1293 also "help revisionspec".
1294 --exclude-common-ancestry Display only the revisions that are not
1295 part of both ancestries (require
1296 -rX..Y).
1297 --forward Show from oldest to newest.
1298 --help, -h Show help message.
1299 --include-merged Show merged revisions like --levels 0
1300 does.
1301 --levels N, -n Number of levels to display - 0 for all,
1302 1 for flat.
1303 --limit N, -l Limit the output to the first N
1304 revisions.
1305 --log-format ARG Use specified log format.
1306 --gnu-changelog Format used by GNU ChangeLog files.
1307 --line Log format with one line per revision.
1308 --long Detailed log format.
1309 --short Moderately short log format.
1310 --match ARG, -m Show revisions whose properties match
1311 this expression.
1312 --match-author ARG Show revisions whose authors match this
1313 expression.
1314 --match-bugs ARG Show revisions whose bugs match this
1315 expression.
1316 --match-committer ARG Show revisions whose committer matches
1317 this expression.
1318 --match-message ARG Show revisions whose message matches
1319 this expression.
1320 --omit-merges Do not report commits with more than one
1321 parent.
1322 --quiet, -q Only display errors and warnings.
1323 --revision ARG, -r See "help revisionspec" for details.
1324 --show-diff, -p Show changes made in each revision as a
1325 patch.
1326 --show-ids Show internal object ids.
1327 --signatures Show digital signature validity.
1328 --timezone ARG Display timezone as local, original, or
1329 utc.
1330 --usage Show usage message and options.
1331 --verbose, -v Show files changed in each revision.
1332 See also: log-formats, revisionspec
1334 Show historical log for a branch or subset of a branch.
1336 log is bzr´s default tool for exploring the history of a branch. The
1338 branch to use is taken from the first parameter. If no parameters are
1339 given, the branch containing the working directory is logged. Here are
1340 some simple examples:
1341 bzr log log the current branch
1343 bzr log foo.py log a file in its branch
1344 bzr log http://server/branch log a branch on a server
1345 The filtering, ordering and information shown for each revision can be
1347 controlled as explained below. By default, all revisions are shown
1348 sorted (topologically) so that newer revisions appear before older ones
1349 and descendants always appear before ancestors. If displayed, merged
1350 revisions are shown indented under the revision in which they were
1351 merged.
1352 Output control:
1354 The log format controls how information about each revision is
1356 displayed. The standard log formats are called ``long``, ``short``
1357 and ``line``. The default is long. See ``bzr help log-formats``
1358 for more details on log formats.
1359 The following options can be used to control what information is
1361 displayed:
1362 -l N display a maximum of N revisions
1364 -n N display N levels of revisions (0 for all, 1 for col‐
1365 lapsed)
1366 -v display a status summary (delta) for each revision
1367 -p display a diff (patch) for each revision
1368 --show-ids display revision-ids (and file-ids), not just revnos
1369 Note that the default number of levels to display is a function of
1371 the
1372 log format. If the -n option is not used, the standard log formats
1373 show
1374 just the top level (mainline).
1375 Status summaries are shown using status flags like A, M, etc. To see
1377 the changes explained using words like ``added`` and ``modified``
1378 instead, use the -vv option.
1379 Ordering control:
1381 To display revisions from oldest to newest, use the --forward option.
1383 In most cases, using this option will have little impact on the total
1384 time taken to produce a log, though --forward does not incrementally
1385 display revisions like --reverse does when it can.
1386 Revision filtering:
1388 The -r option can be used to specify what revision or range of revi‐
1390 sions
1391 to filter against. The various forms are shown below:
1392 -rX display revision X
1394 -rX.. display revision X and later
1395 -r..Y display up to and including revision Y
1396 -rX..Y display from X to Y inclusive
1397 See ``bzr help revisionspec`` for details on how to specify X and Y.
1399 Some common examples are given below:
1400 -r-1 show just the tip
1402 -r-10.. show the last 10 mainline revisions
1403 -rsubmit:.. show what´s new on this branch
1404 -rancestor:path.. show changes since the common ancestor of this
1405 branch and the one at location path
1406 -rdate:yesterday.. show changes since yesterday
1407 When logging a range of revisions using -rX..Y, log starts at
1409 revision Y and searches back in history through the primary
1410 ("left-hand") parents until it finds X. When logging just the
1411 top level (using -n1), an error is reported if X is not found
1412 along the way. If multi-level logging is used (-n0), X may be
1413 a nested merge revision and the log will be truncated accordingly.
1414 Path filtering:
1416 If parameters are given and the first one is not a branch, the log
1418 will be filtered to show only those revisions that changed the
1419 nominated files or directories.
1420 Filenames are interpreted within their historical context. To log a
1422 deleted file, specify a revision range so that the file existed at
1423 the end or start of the range.
1424 Historical context is also important when interpreting pathnames of
1426 renamed files/directories. Consider the following example:
1427 * revision 1: add tutorial.txt
1429 * revision 2: modify tutorial.txt
1430 * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
1431 In this case:
1433 * ``bzr log guide.txt`` will log the file added in revision 1
1435 * ``bzr log tutorial.txt`` will log the new file added in revision 3
1437 * ``bzr log -r2 -p tutorial.txt`` will show the changes made to
1439 the original file in revision 2.
1440 * ``bzr log -r2 -p guide.txt`` will display an error message as there
1442 was no file called guide.txt in revision 2.
1443 Renames are always followed by log. By design, there is no need to
1445 explicitly ask for this (and no way to stop logging a file back
1446 until it was last renamed).
1447 Other filtering:
1449 The --match option can be used for finding revisions that match a
1451 regular expression in a commit message, committer, author or bug.
1452 Specifying the option several times will match any of the supplied
1453 expressions. --match-author, --match-bugs, --match-committer and
1454 --match-message can be used to only match a specific field.
1455 Tips & tricks:
1457 GUI tools and IDEs are often better at exploring history than command
1459 line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
1460 bzr-explorer shell, or the Loggerhead web interface. See the Plugin
1461 Guide <http://doc.bazaar.canonical.com/plugins/en/> and
1462 <http://wiki.bazaar.canonical.com/IDEIntegration>.
1463 You may find it useful to add the aliases below to ``bazaar.conf``:
1465 [ALIASES]
1467 tip = log -r-1
1468 top = log -l10 --line
1469 show = log -v -p
1470 ``bzr tip`` will then show the latest revision while ``bzr top``
1472 will show the last 10 mainline revisions. To see the details of a
1473 particular revision X, ``bzr show -rX``.
1474 If you are interested in looking deeper into a particular merge X,
1476 use ``bzr log -n0 -rX``.
1477 ``bzr log -v`` on a branch with lots of history is currently
1479 very slow. A fix for this issue is currently under development.
1480 With or without that fix, it is recommended that a revision range
1481 be given when using the -v option.
1482 bzr has a generic full-text matching plugin, bzr-search, that can be
1484 used to find revisions matching user names, commit messages, etc.
1485 Among other features, this plugin can find all revisions containing
1486 a list of words but not others.
1487 When exploring non-mainline history on large projects with deep
1489 history, the performance of log can be greatly improved by installing
1490 the historycache plugin. This plugin buffers historical information
1491 trading disk space for faster speed.
1492 bzr ls [PATH]
1495 Options:
1496 --directory ARG, -d Branch to operate on, instead of working
1497 directory.
1498 --from-root Print paths relative to the root of the
1499 branch.
1500 --help, -h Show help message.
1501 --ignored, -i Print ignored files.
1502 --kind ARG, -k List entries of a particular kind: file,
1503 directory, symlink.
1504 --null, -0 Use an ASCII NUL (\0) separator rather
1505 than a newline.
1506 --quiet, -q Only display errors and warnings.
1507 --recursive, -R Recurse into subdirectories.
1508 --revision ARG, -r See "help revisionspec" for details.
1509 --show-ids Show internal object ids.
1510 --unknown, -u Print unknown files.
1511 --usage Show usage message and options.
1512 --verbose, -v Display more information.
1513 --versioned, -V Print versioned files.
1514 See also: cat, status
1516 List files in a tree.
1518 bzr merge [LOCATION]
1522 Options:
1523 --change ARG, -c Select changes introduced by the
1524 specified revision. See also "help
1525 revisionspec".
1526 --directory ARG, -d Branch to merge into, rather than the
1527 one containing the working directory.
1528 --force Merge even if the destination tree has
1529 uncommitted changes.
1530 --help, -h Show help message.
1531 --interactive, -i Select changes interactively.
1532 --merge-type ARG Select a particular merge algorithm.
1533 --diff3 Merge using external diff3.
1534 --lca LCA-newness merge.
1535 --merge3 Native diff3-style merge.
1536 --weave Weave-based merge.
1537 --preview Instead of merging, show a diff of the
1538 merge.
1539 --pull If the destination is already completely
1540 merged into the source, pull from the
1541 source rather than merging. When this
1542 happens, you do not need to commit the
1543 result.
1544 --quiet, -q Only display errors and warnings.
1545 --remember Remember the specified location as a
1546 default.
1547 --reprocess Reprocess to reduce spurious conflicts.
1548 --revision ARG, -r See "help revisionspec" for details.
1549 --show-base Show base revision text in conflicts.
1550 --uncommitted Apply uncommitted changes from a working
1551 copy, instead of branch changes.
1552 --usage Show usage message and options.
1553 --verbose, -v Display more information.
1554 See also: remerge, send, status-flags, update
1556 Perform a three-way merge.
1558 The source of the merge can be specified either in the form of a
1560 branch, or in the form of a path to a file containing a merge directive
1561 generated with bzr send. If neither is specified, the default is the
1562 upstream branch or the branch most recently merged using --remember.
1563 The source of the merge may also be specified in the form of a path to
1564 a file in another branch: in this case, only the modifications to that
1565 file are merged into the current working tree.
1566 When merging from a branch, by default bzr will try to merge in all new
1568 work from the other branch, automatically determining an appropriate
1569 base revision. If this fails, you may need to give an explicit base.
1570 To pick a different ending revision, pass "--revision OTHER". bzr will
1572 try to merge in all new work up to and including revision OTHER.
1573 If you specify two values, "--revision BASE..OTHER", only revisions
1575 BASE through OTHER, excluding BASE but including OTHER, will be merged.
1576 If this causes some revisions to be skipped, i.e. if the destination
1577 branch does not already contain revision BASE, such a merge is commonly
1578 referred to as a "cherrypick". Unlike a normal merge, Bazaar does not
1579 currently track cherrypicks. The changes look like a normal commit, and
1580 the history of the changes from the other branch is not stored in the
1581 commit.
1582 Revision numbers are always relative to the source branch.
1584 Merge will do its best to combine the changes in two branches, but
1586 there are some kinds of problems only a human can fix. When it encoun‐
1587 ters those, it will mark a conflict. A conflict means that you need to
1588 fix something, before you can commit.
1589 Use bzr resolve when you have fixed a problem. See also bzr conflicts.
1591 If there is no default branch set, the first merge will set it (use
1593 --no-remember to avoid setting it). After that, you can omit the branch
1594 to use the default. To change the default, use --remember. The value
1595 will only be saved if the remote location can be accessed.
1596 The results of the merge are placed into the destination working direc‐
1598 tory, where they can be reviewed (with bzr diff), tested, and then com‐
1599 mitted to record the result of the merge.
1600 merge refuses to run if there are any uncommitted changes, unless
1602 --force is given. If --force is given, then the changes from the
1603 source will be merged with the current working tree, including any
1604 uncommitted changes in the tree. The --force option can also be used
1605 to create a merge revision which has more than two parents.
1606 If one would like to merge changes from the working tree of the other
1608 branch without merging any committed revisions, the --uncommitted
1609 option can be given.
1610 To select only some changes to merge, use "merge -i", which will prompt
1612 you to apply each diff hunk and file change, similar to "shelve".
1613 Examples:
1615 To merge all new revisions from bzr.dev:
1616 bzr merge ../bzr.dev
1618 To merge changes up to and including revision 82 from bzr.dev:
1620 bzr merge -r 82 ../bzr.dev
1622 To merge the changes introduced by 82, without previous changes:
1624 bzr merge -r 81..82 ../bzr.dev
1626 To apply a merge directive contained in /tmp/merge:
1628 bzr merge /tmp/merge
1630 To create a merge revision with three parents from two branches
1632 feature1a and feature1b:
1633 bzr merge ../feature1a
1635 bzr merge ../feature1b --force
1636 bzr commit -m ´revision with three parents´
1637 bzr missing [OTHER_BRANCH]
1640 Options:
1641 --directory ARG, -d Branch to operate on, instead of working
1642 directory.
1643 --help, -h Show help message.
1644 --include-merged Show all revisions in addition to the
1645 mainline ones.
1646 --log-format ARG Use specified log format.
1647 --gnu-changelog Format used by GNU ChangeLog files.
1648 --line Log format with one line per revision.
1649 --long Detailed log format.
1650 --short Moderately short log format.
1651 --mine-only Display changes in the local branch
1652 only.
1653 --my-revision ARG Filter on local branch revisions
1654 (inclusive). See "help revisionspec" for
1655 details.
1656 --other Same as --theirs-only.
1657 --quiet, -q Only display errors and warnings.
1658 --reverse Reverse the order of revisions.
1659 --revision ARG, -r Filter on other branch revisions
1660 (inclusive). See "help revisionspec" for
1661 details.
1662 --show-ids Show internal object ids.
1663 --theirs-only Display changes in the remote branch
1664 only.
1665 --this Same as --mine-only.
1666 --usage Show usage message and options.
1667 --verbose, -v Display more information.
1668 See also: merge, pull
1670 Show unmerged/unpulled revisions between two branches.
1672 OTHER_BRANCH may be local or remote.
1674 To filter on a range of revisions, you can use the command -r
1676 begin..end -r revision requests a specific revision, -r ..end or -r
1677 begin.. are also valid.
1678 Exit values:
1680 1 - some missing revisions
1681 0 - no missing revisions
1682 Examples:
1684 Determine the missing revisions between this and the branch at the
1686 remembered pull location:
1687 bzr missing
1689 Determine the missing revisions between this and another branch:
1691 bzr missing http://server/branch
1693 Determine the missing revisions up to a specific revision on the
1695 other
1696 branch:
1697 bzr missing -r ..-10
1699 Determine the missing revisions up to a specific revision on this
1701 branch:
1702 bzr missing --my-revision ..-10
1704 bzr mkdir DIR...
1707 Options:
1708 --help, -h Show help message.
1709 --parents, -p No error if existing, make parent
1710 directories as needed.
1711 --quiet, -q Only display errors and warnings.
1712 --usage Show usage message and options.
1713 --verbose, -v Display more information.
1714 Create a new versioned directory.
1716 This is equivalent to creating the directory and then adding it.
1718 bzr move
1721 Alias for "mv", see "bzr mv".
1722 bzr mv [NAMES...]
1724 Options:
1725 --after Move only the bzr identifier of the
1726 file, because the file has already been
1727 moved.
1728 --auto Automatically guess renames.
1729 --dry-run Avoid making changes when guessing
1730 renames.
1731 --help, -h Show help message.
1732 --quiet, -q Only display errors and warnings.
1733 --usage Show usage message and options.
1734 --verbose, -v Display more information.
1735 Aliases: move, rename
1737 Move or rename a file.
1739 Usage:
1741 bzr mv OLDNAME NEWNAME
1742 bzr mv SOURCE... DESTINATION
1744 If the last argument is a versioned directory, all the other names are
1746 moved into it. Otherwise, there must be exactly two arguments and the
1747 file is changed to a new name.
1748 If OLDNAME does not exist on the filesystem but is versioned and NEW‐
1750 NAME does exist on the filesystem but is not versioned, mv assumes that
1751 the file has been manually moved and only updates its internal inven‐
1752 tory to reflect that change. The same is valid when moving many SOURCE
1753 files to a DESTINATION.
1754 Files cannot be moved between branches.
1756 bzr nick [NICKNAME]
1759 Options:
1760 --directory ARG, -d Branch to operate on, instead of working
1761 directory.
1762 --help, -h Show help message.
1763 --quiet, -q Only display errors and warnings.
1764 --usage Show usage message and options.
1765 --verbose, -v Display more information.
1766 See also: info
1768 Print or set the branch nickname.
1770 If unset, the colocated branch name is used for colocated branches, and
1772 the branch directory name is used for other branches. To print the
1773 current nickname, execute with no argument.
1774 Bound branches use the nickname of its master branch unless it is set
1776 locally.
1777 bzr pack [BRANCH_OR_REPO]
1780 Options:
1781 --clean-obsolete-packs Delete obsolete packs to save disk
1782 space.
1783 --help, -h Show help message.
1784 --quiet, -q Only display errors and warnings.
1785 --usage Show usage message and options.
1786 --verbose, -v Display more information.
1787 See also: repositories
1789 Compress the data within a repository.
1791 This operation compresses the data within a bazaar repository. As
1793 bazaar supports automatic packing of repository, this operation is nor‐
1794 mally not required to be done manually.
1795 During the pack operation, bazaar takes a backup of existing repository
1797 data, i.e. pack files. This backup is eventually removed by bazaar
1798 automatically when it is safe to do so. To save disk space by removing
1799 the backed up pack files, the --clean-obsolete-packs option may be
1800 used.
1801 Warning: If you use --clean-obsolete-packs and your machine crashes
1803 during or immediately after repacking, you may be left with a state
1804 where the deletion has been written to disk but the new packs have not
1805 been. In this case the repository may be unusable.
1806 bzr plugins
1809 Options:
1810 --help, -h Show help message.
1811 --quiet, -q Only display errors and warnings.
1812 --usage Show usage message and options.
1813 --verbose, -v Display more information.
1814 List the installed plugins.
1816 This command displays the list of installed plugins including version
1818 of plugin and a short description of each.
1819 --verbose shows the path where each plugin is located.
1821 A plugin is an external component for Bazaar that extends the revision
1823 control system, by adding or replacing code in Bazaar. Plugins can do
1824 a variety of things, including overriding commands, adding new com‐
1825 mands, providing additional network transports and customizing log out‐
1826 put.
1827 See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plug‐
1829 ins/en/> for further information on plugins including where to find
1830 them and how to install them. Instructions are also provided there on
1831 how to write new plugins using the Python programming language.
1832 bzr praise
1835 Alias for "annotate", see "bzr annotate".
1836 bzr pull [LOCATION]
1838 Options:
1839 --directory ARG, -d Branch to pull into, rather than the one
1840 containing the working directory.
1841 --help, -h Show help message.
1842 --local Perform a local pull in a bound branch.
1843 Local pulls are not applied to the
1844 master branch.
1845 --overwrite Ignore differences between branches and
1846 overwrite unconditionally.
1847 --quiet, -q Only display errors and warnings.
1848 --remember Remember the specified location as a
1849 default.
1850 --revision ARG, -r See "help revisionspec" for details.
1851 --show-base Show base revision text in conflicts.
1852 --usage Show usage message and options.
1853 --verbose, -v Show logs of pulled revisions.
1854 See also: push, send, status-flags, update
1856 Turn this branch into a mirror of another branch.
1858 By default, this command only works on branches that have not diverged.
1860 Branches are considered diverged if the destination branch´s most
1861 recent commit is one that has not been merged (directly or indirectly)
1862 into the parent.
1863 If branches have diverged, you can use ´bzr merge´ to integrate the
1865 changes from one into the other. Once one branch has merged, the other
1866 should be able to pull it again.
1867 If you want to replace your local changes and just want your branch to
1869 match the remote one, use pull --overwrite. This will work even if the
1870 two branches have diverged.
1871 If there is no default location set, the first pull will set it (use
1873 --no-remember to avoid setting it). After that, you can omit the loca‐
1874 tion to use the default. To change the default, use --remember. The
1875 value will only be saved if the remote location can be accessed.
1876 The --verbose option will display the revisions pulled using the
1878 log_format configuration option. You can use a different format by
1879 overriding it with -Olog_format=<other_format>.
1880 Note: The location can be specified either in the form of a branch, or
1882 in the form of a path to a file containing a merge directive generated
1883 with bzr send.
1884 bzr push [LOCATION]
1887 Options:
1888 --create-prefix Create the path leading up to the branch
1889 if it does not already exist.
1890 --directory ARG, -d Branch to push from, rather than the one
1891 containing the working directory.
1892 --help, -h Show help message.
1893 --no-tree Don´t populate the working tree, even
1894 for protocols that support it.
1895 --overwrite Ignore differences between branches and
1896 overwrite unconditionally.
1897 --quiet, -q Only display errors and warnings.
1898 --remember Remember the specified location as a
1899 default.
1900 --revision ARG, -r See "help revisionspec" for details.
1901 --stacked Create a stacked branch that references
1902 the public location of the parent
1903 branch.
1904 --stacked-on ARG Create a stacked branch that refers to
1905 another branch for the commit history.
1906 Only the work not present in the
1907 referenced branch is included in the
1908 branch created.
1909 --strict Refuse to push if there are uncommitted
1910 changes in the working tree, --no-strict
1911 disables the check.
1912 --usage Show usage message and options.
1913 --use-existing-dir By default push will fail if the target
1914 directory exists, but does not already
1915 have a control directory. This flag
1916 will allow push to proceed.
1917 --verbose, -v Display more information.
1918 See also: pull, update, working-trees
1920 Update a mirror of this branch.
1922 The target branch will not have its working tree populated because this
1924 is both expensive, and is not supported on remote file systems.
1925 Some smart servers or protocols *may* put the working tree in place in
1927 the future.
1928 This command only works on branches that have not diverged. Branches
1930 are considered diverged if the destination branch´s most recent commit
1931 is one that has not been merged (directly or indirectly) by the source
1932 branch.
1933 If branches have diverged, you can use ´bzr push --overwrite´ to
1935 replace the other branch completely, discarding its unmerged changes.
1936 If you want to ensure you have the different changes in the other
1938 branch, do a merge (see bzr help merge) from the other branch, and com‐
1939 mit that. After that you will be able to do a push without ´--over‐
1940 write´.
1941 If there is no default push location set, the first push will set it
1943 (use --no-remember to avoid setting it). After that, you can omit the
1944 location to use the default. To change the default, use --remember.
1945 The value will only be saved if the remote location can be accessed.
1946 The --verbose option will display the revisions pushed using the
1948 log_format configuration option. You can use a different format by
1949 overriding it with -Olog_format=<other_format>.
1950 bzr reconcile [BRANCH]
1953 Options:
1954 --help, -h Show help message.
1955 --quiet, -q Only display errors and warnings.
1956 --usage Show usage message and options.
1957 --verbose, -v Display more information.
1958 See also: check
1960 Reconcile bzr metadata in a branch.
1962 This can correct data mismatches that may have been caused by previous
1964 ghost operations or bzr upgrades. You should only need to run this com‐
1965 mand if ´bzr check´ or a bzr developer advises you to run it.
1966 If a second branch is provided, cross-branch reconciliation is also
1968 attempted, which will check that data like the tree root id which was
1969 not present in very early bzr versions is represented correctly in both
1970 branches.
1971 At the same time it is run it may recompress data resulting in a poten‐
1973 tial saving in disk space or performance gain.
1974 The branch *MUST* be on a listable system such as local disk or sftp.
1976 bzr reconfigure [LOCATION]
1979 Options:
1980 --bind-to ARG Branch to bind checkout to.
1981 --force Perform reconfiguration even if local
1982 changes will be lost.
1983 --help, -h Show help message.
1984 --quiet, -q Only display errors and warnings.
1985 --repository_trees ARG Whether new branches in the repository
1986 have trees.
1987 --with-no-trees Reconfigure repository to not create
1988 working trees on branches by default.
1989 --with-trees Reconfigure repository to create working
1990 trees on branches by default.
1991 --repository_type ARG Location fo the repository.
1992 --standalone Reconfigure to be a standalone branch
1993 (i.e. stop using shared repository).
1994 --use-shared Reconfigure to use a shared repository.
1995 --stacked-on ARG Reconfigure a branch to be stacked on
1996 another branch.
1997 --tree_type ARG The relation between branch and tree.
1998 --branch Reconfigure to be an unbound branch with
1999 no working tree.
2000 --checkout Reconfigure to be a bound branch with a
2001 working tree.
2002 --lightweight-checkout Reconfigure to be a lightweight checkout
2003 (with no local history).
2004 --tree Reconfigure to be an unbound branch with
2005 a working tree.
2006 --unstacked Reconfigure a branch to be unstacked.
2007 This may require copying substantial
2008 data into it.
2009 --usage Show usage message and options.
2010 --verbose, -v Display more information.
2011 See also: branches, checkouts, standalone-trees, working-trees
2013 Reconfigure the type of a bzr directory.
2015 A target configuration must be specified.
2017 For checkouts, the bind-to location will be auto-detected if not speci‐
2019 fied. The order of preference is 1. For a lightweight checkout, the
2020 current bound location. 2. For branches that used to be checkouts, the
2021 previously-bound location. 3. The push location. 4. The parent loca‐
2022 tion. If none of these is available, --bind-to must be specified.
2023 bzr remerge [FILE...]
2026 Options:
2027 --help, -h Show help message.
2028 --merge-type ARG Select a particular merge algorithm.
2029 --diff3 Merge using external diff3.
2030 --lca LCA-newness merge.
2031 --merge3 Native diff3-style merge.
2032 --weave Weave-based merge.
2033 --quiet, -q Only display errors and warnings.
2034 --reprocess Reprocess to reduce spurious conflicts.
2035 --show-base Show base revision text in conflicts.
2036 --usage Show usage message and options.
2037 --verbose, -v Display more information.
2038 Redo a merge.
2040 Use this if you want to try a different merge technique while resolving
2042 conflicts. Some merge techniques are better than others, and remerge
2043 lets you try different ones on different files.
2044 The options for remerge have the same meaning and defaults as the ones
2046 for merge. The difference is that remerge can (only) be run when there
2047 is a pending merge, and it lets you specify particular files.
2048 Examples:
2050 Re-do the merge of all conflicted files, and show the base text in
2051 conflict regions, in addition to the usual THIS and OTHER texts:
2052 bzr remerge --show-base
2054 Re-do the merge of "foobar", using the weave merge algorithm, with
2056 additional processing to reduce the size of conflict regions:
2057 bzr remerge --merge-type weave --reprocess foobar
2059 bzr remove [FILE...]
2062 Options:
2063 --file-deletion-strategy ARGThe file deletion mode to be used.
2064 --force Delete all the specified files, even if
2065 they can not be recovered and even if
2066 they are non-empty directories.
2067 (deprecated, use no-backup)
2068 --keep Delete from bzr but leave the working
2069 copy.
2070 --no-backup Don´t backup changed files.
2071 --safe Backup changed files (default).
2072 --help, -h Show help message.
2073 --new Only remove files that have never been
2074 committed.
2075 --quiet, -q Only display errors and warnings.
2076 --usage Show usage message and options.
2077 --verbose, -v Display more information.
2078 Aliases: rm, del
2080 Remove files or directories.
2082 This makes Bazaar stop tracking changes to the specified files. Bazaar
2084 will delete them if they can easily be recovered using revert otherwise
2085 they will be backed up (adding an extention of the form .~#~). If no
2086 options or parameters are given Bazaar will scan for files that are
2087 being tracked by Bazaar but missing in your tree and stop tracking them
2088 for you.
2089 bzr remove-branch [LOCATION]
2092 Options:
2093 --directory ARG, -d Branch to operate on, instead of working
2094 directory.
2095 --force Remove branch even if it is the active
2096 branch.
2097 --help, -h Show help message.
2098 --quiet, -q Only display errors and warnings.
2099 --usage Show usage message and options.
2100 --verbose, -v Display more information.
2101 Alias: rmbranch
2103 Remove a branch.
2105 This will remove the branch from the specified location but will keep
2107 any working tree or repository in place.
2108 Examples:
2110 Remove the branch at repo/trunk:
2112 bzr remove-branch repo/trunk
2114 bzr remove-tree [LOCATION...]
2117 Options:
2118 --force Remove the working tree even if it has
2119 uncommitted or shelved changes.
2120 --help, -h Show help message.
2121 --quiet, -q Only display errors and warnings.
2122 --usage Show usage message and options.
2123 --verbose, -v Display more information.
2124 See also: checkout, working-trees
2126 Remove the working tree from a given branch/checkout.
2128 Since a lightweight checkout is little more than a working tree this
2130 will refuse to run against one.
2131 To re-create the working tree, use "bzr checkout".
2133 bzr rename
2136 Alias for "mv", see "bzr mv".
2137 bzr renames [DIR]
2139 Options:
2140 --help, -h Show help message.
2141 --quiet, -q Only display errors and warnings.
2142 --usage Show usage message and options.
2143 --verbose, -v Display more information.
2144 See also: status
2146 Show list of renamed files.
2148 bzr resolve [FILE...]
2152 Options:
2153 --action ARG How to resolve the conflict.
2154 --done Marks the conflict as resolved.
2155 --take-other Resolve the conflict taking the merged
2156 version into account.
2157 --take-this Resolve the conflict preserving the
2158 version in the working tree.
2159 --all Resolve all conflicts in this tree.
2160 --directory ARG, -d Branch to operate on, instead of working
2161 directory.
2162 --help, -h Show help message.
2163 --quiet, -q Only display errors and warnings.
2164 --usage Show usage message and options.
2165 --verbose, -v Display more information.
2166 Alias: resolved
2168 See also: conflicts
2170 Mark a conflict as resolved.
2172 Merge will do its best to combine the changes in two branches, but
2174 there are some kinds of problems only a human can fix. When it encoun‐
2175 ters those, it will mark a conflict. A conflict means that you need to
2176 fix something, before you can commit.
2177 Once you have fixed a problem, use "bzr resolve" to automatically mark
2179 text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict
2180 as resolved, or "bzr resolve --all" to mark all conflicts as resolved.
2181 bzr resolved
2184 Alias for "resolve", see "bzr resolve".
2185 bzr revert [FILE...]
2187 Options:
2188 --forget-merges Remove pending merge marker, without
2189 changing any files.
2190 --help, -h Show help message.
2191 --no-backup Do not save backups of reverted files.
2192 --quiet, -q Only display errors and warnings.
2193 --revision ARG, -r See "help revisionspec" for details.
2194 --usage Show usage message and options.
2195 --verbose, -v Display more information.
2196 See also: cat, export, merge, shelve
2198 Revert files to a previous revision.
2200 Giving a list of files will revert only those files. Otherwise, all
2202 files will be reverted. If the revision is not specified with ´--revi‐
2203 sion´, the last committed revision is used.
2204 To remove only some changes, without reverting to a prior version, use
2206 merge instead. For example, "merge . -r -2..-3" (don´t forget the ".")
2207 will remove the changes introduced by the second last commit (-2),
2208 without affecting the changes introduced by the last commit (-1). To
2209 remove certain changes on a hunk-by-hunk basis, see the shelve command.
2210 By default, any files that have been manually changed will be backed up
2212 first. (Files changed only by merge are not backed up.) Backup files
2213 have ´.~#~´ appended to their name, where # is a number.
2214 When you provide files, you can use their current pathname or the path‐
2216 name from the target revision. So you can use revert to "undelete" a
2217 file by name. If you name a directory, all the contents of that direc‐
2218 tory will be reverted.
2219 If you have newly added files since the target revision, they will be
2221 removed. If the files to be removed have been changed, backups will be
2222 created as above. Directories containing unknown files will not be
2223 deleted.
2224 The working tree contains a list of revisions that have been merged but
2226 not yet committed. These revisions will be included as additional par‐
2227 ents of the next commit. Normally, using revert clears that list as
2228 well as reverting the files. If any files are specified, revert leaves
2229 the list of uncommitted merges alone and reverts only the files. Use
2230 ``bzr revert and ``bzr revert --forget-merges`` to clear the pending
2231 merge list without reverting any files.
2232 Using "bzr revert --forget-merges", it is possible to apply all of the
2234 changes from a branch in a single revision. To do this, perform the
2235 merge as desired. Then doing revert with the "--forget-merges" option
2236 will keep the content of the tree as it was, but it will clear the list
2237 of pending merges. The next commit will then contain all of the
2238 changes that are present in the other branch, but without any other
2239 parent revisions. Because this technique forgets where these changes
2240 originated, it may cause additional conflicts on later merges involving
2241 the same source and target branches.
2242 bzr revno [LOCATION]
2245 Options:
2246 --help, -h Show help message.
2247 --quiet, -q Only display errors and warnings.
2248 --revision ARG, -r See "help revisionspec" for details.
2249 --tree Show revno of working tree.
2250 --usage Show usage message and options.
2251 --verbose, -v Display more information.
2252 See also: info
2254 Show current revision number.
2256 This is equal to the number of revisions on this branch.
2258 bzr rm
2261 Alias for "remove", see "bzr remove".
2262 bzr rmbranch
2264 Alias for "remove-branch", see "bzr remove-branch".
2265 bzr root [FILENAME]
2267 Options:
2268 --help, -h Show help message.
2269 --quiet, -q Only display errors and warnings.
2270 --usage Show usage message and options.
2271 --verbose, -v Display more information.
2272 Show the tree root directory.
2274 The root is the nearest enclosing directory with a .bzr control direc‐
2276 tory.
2277 bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
2280 Options:
2281 --body ARG Body for the email.
2282 --format ARG Use the specified output format.
2283 --from ARG, -f Branch to generate the submission from,
2284 rather than the one containing the
2285 working directory.
2286 --help, -h Show help message.
2287 --mail-to ARG Mail the request to this address.
2288 --message ARG, -m Message string.
2289 --no-bundle Do not include a bundle in the merge
2290 directive.
2291 --no-patch Do not include a preview patch in the
2292 merge directive.
2293 --output ARG, -o Write merge directive to this file or
2294 directory; use - for stdout.
2295 --quiet, -q Only display errors and warnings.
2296 --remember Remember submit and public branch.
2297 --revision ARG, -r See "help revisionspec" for details.
2298 --strict Refuse to send if there are uncommitted
2299 changes in the working tree, --no-strict
2300 disables the check.
2301 --usage Show usage message and options.
2302 --verbose, -v Display more information.
2303 See also: merge, pull
2305 Mail or create a merge-directive for submitting changes.
2307 A merge directive provides many things needed for requesting merges:
2309 * A machine-readable description of the merge to perform
2311 * An optional patch that is a preview of the changes requested
2313 * An optional bundle of revision data, so that the changes can be
2315 applied
2316 directly from the merge directive, without retrieving data from a
2317 branch.
2318 `bzr send` creates a compact data set that, when applied using bzr
2320 merge, has the same effect as merging from the source branch.
2321 By default the merge directive is self-contained and can be applied to
2323 any branch containing submit_branch in its ancestory without needing
2324 access to the source branch.
2325 If --no-bundle is specified, then Bazaar doesn´t send the contents of
2327 the revisions, but only a structured request to merge from the pub‐
2328 lic_location. In that case the public_branch is needed and it must be
2329 up-to-date and accessible to the recipient. The public_branch is
2330 always included if known, so that people can check it later.
2331 The submit branch defaults to the parent of the source branch, but can
2333 be overridden. Both submit branch and public branch will be remembered
2334 in branch.conf the first time they are used for a particular branch.
2335 The source branch defaults to that containing the working directory,
2336 but can be changed using --from.
2337 Both the submit branch and the public branch follow the usual behavior
2339 with respect to --remember: If there is no default location set, the
2340 first send will set it (use --no-remember to avoid setting it). After
2341 that, you can omit the location to use the default. To change the
2342 default, use --remember. The value will only be saved if the location
2343 can be accessed.
2344 In order to calculate those changes, bzr must analyse the submit
2346 branch. Therefore it is most efficient for the submit branch to be a
2347 local mirror. If a public location is known for the submit_branch,
2348 that location is used in the merge directive.
2349 The default behaviour is to send the merge directive by mail, unless -o
2351 is given, in which case it is sent to a file.
2352 Mail is sent using your preferred mail program. This should be trans‐
2354 parent on Windows (it uses MAPI). On Unix, it requires the xdg-email
2355 utility. If the preferred client can´t be found (or used), your editor
2356 will be used.
2357 To use a specific mail program, set the mail_client configuration
2359 option. (For Thunderbird 1.5, this works around some bugs.) Supported
2360 values for specific clients are "claws", "evolution", "kmail",
2361 "mail.app" (MacOS X´s Mail.app), "mutt", and "thunderbird"; generic
2362 options are "default", "editor", "emacsclient", "mapi", and
2363 "xdg-email". Plugins may also add supported clients.
2364 If mail is being sent, a to address is required. This can be supplied
2366 either on the commandline, by setting the submit_to configuration
2367 option in the branch itself or the child_submit_to configuration option
2368 in the submit branch.
2369 Two formats are currently supported: "4" uses revision bundle format 4
2371 and merge directive format 2. It is significantly faster and smaller
2372 than older formats. It is compatible with Bazaar 0.19 and later. It
2373 is the default. "0.9" uses revision bundle format 0.9 and merge direc‐
2374 tive format 1. It is compatible with Bazaar 0.12 - 0.18.
2375 The merge directives created by bzr send may be applied using bzr merge
2377 or bzr pull by specifying a file containing a merge directive as the
2378 location.
2379 bzr send makes extensive use of public locations to map local locations
2381 into URLs that can be used by other people. See `bzr help configura‐
2382 tion` to set them, and use `bzr info` to display them.
2383 bzr serve
2386 Options:
2387 --allow-writes By default the server is a readonly
2388 server. Supplying --allow-writes
2389 enables write access to the contents of
2390 the served directory and below. Note
2391 that ``bzr serve`` does not perform
2392 authentication, so unless some form of
2393 external authentication is arranged
2394 supplying this option leads to global
2395 uncontrolled write access to your file
2396 system.
2397 --client-timeout ARG Override the default idle client timeout
2398 (5min).
2399 --directory ARG, -d Serve contents of this directory.
2400 --help, -h Show help message.
2401 --inet Serve on stdin/out for use from inetd or
2402 sshd.
2403 --port ARG Listen for connections on nominated port
2404 of the form [hostname:]portnumber.
2405 Passing 0 as the port number will result
2406 in a dynamically allocated port. The
2407 default port depends on the protocol.
2408 --protocol ARG Protocol to serve.
2409 --bzr The Bazaar smart server protocol over
2410 TCP. (default port: 4155)
2411 --quiet, -q Only display errors and warnings.
2412 --usage Show usage message and options.
2413 --verbose, -v Display more information.
2414 Alias: server
2416 Run the bzr server.
2418 bzr server
2421 Alias for "serve", see "bzr serve".
2422 bzr shelve [FILE...]
2424 Options:
2425 --all Shelve all changes.
2426 --destroy Destroy removed changes instead of
2427 shelving them.
2428 --directory ARG, -d Branch to operate on, instead of working
2429 directory.
2430 --help, -h Show help message.
2431 --list List shelved changes.
2432 --message ARG, -m Message string.
2433 --quiet, -q Only display errors and warnings.
2434 --revision ARG, -r See "help revisionspec" for details.
2435 --usage Show usage message and options.
2436 --verbose, -v Display more information.
2437 --writer ARG Method to use for writing diffs.
2438 --plain Plaintext diff output.
2439 See also: configuration, unshelve
2441 Temporarily set aside some changes from the current tree.
2443 Shelve allows you to temporarily put changes you´ve made "on the
2445 shelf", ie. out of the way, until a later time when you can bring them
2446 back from the shelf with the ´unshelve´ command. The changes are
2447 stored alongside your working tree, and so they aren´t propagated along
2448 with your branch nor will they survive its deletion.
2449 If shelve --list is specified, previously-shelved changes are listed.
2451 Shelve is intended to help separate several sets of changes that have
2453 been inappropriately mingled. If you just want to get rid of all
2454 changes and you don´t need to restore them later, use revert. If you
2455 want to shelve all text changes at once, use shelve --all.
2456 If filenames are specified, only the changes to those files will be
2458 shelved. Other files will be left untouched.
2459 If a revision is specified, changes since that revision will be
2461 shelved.
2462 You can put multiple items on the shelf, and by default, ´unshelve´
2464 will restore the most recently shelved changes.
2465 For complicated changes, it is possible to edit the changes in a sepa‐
2467 rate editor program to decide what the file remaining in the working
2468 copy should look like. To do this, add the configuration option
2469 change_editor = PROGRAM @new_path @old_path
2471 where @new_path is replaced with the path of the new version of the
2473 file and @old_path is replaced with the path of the old version of the
2474 file. The PROGRAM should save the new file with the desired contents
2475 of the file in the working tree.
2476 bzr sign-my-commits [LOCATION] [COMMITTER]
2480 Options:
2481 --dry-run Don´t actually sign anything, just print
2482 the revisions that would be signed.
2483 --help, -h Show help message.
2484 --quiet, -q Only display errors and warnings.
2485 --usage Show usage message and options.
2486 --verbose, -v Display more information.
2487 Sign all commits by a given committer.
2489 If location is not specified the local tree is used. If committer is
2491 not specified the default committer is used.
2492 This does not sign commits that already have signatures.
2494 bzr split TREE
2497 Options:
2498 --help, -h Show help message.
2499 --quiet, -q Only display errors and warnings.
2500 --usage Show usage message and options.
2501 --verbose, -v Display more information.
2502 See also: join
2504 Split a subdirectory of a tree into a separate tree.
2506 This command will produce a target tree in a format that supports rich
2508 roots, like ´rich-root´ or ´rich-root-pack´. These formats cannot be
2509 converted into earlier formats like ´dirstate-tags´.
2510 The TREE argument should be a subdirectory of a working tree. That
2512 subdirectory will be converted into an independent tree, with its own
2513 branch. Commits in the top-level tree will not apply to the new sub‐
2514 tree.
2515 bzr st
2518 Alias for "status", see "bzr status".
2519 bzr stat
2521 Alias for "status", see "bzr status".
2522 bzr status [FILE...]
2524 Options:
2525 --change ARG, -c Select changes introduced by the
2526 specified revision. See also "help
2527 revisionspec".
2528 --help, -h Show help message.
2529 --no-classify Do not mark object type using indicator.
2530 --no-pending Don´t show pending merges.
2531 --quiet, -q Only display errors and warnings.
2532 --revision ARG, -r See "help revisionspec" for details.
2533 --short, -S Use short status indicators.
2534 --show-ids Show internal object ids.
2535 --usage Show usage message and options.
2536 --verbose, -v Display more information.
2537 --versioned, -V Only show versioned files.
2538 Aliases: st, stat
2540 See also: diff, revert, status-flags
2542 Display status summary.
2544 This reports on versioned and unknown files, reporting them grouped by
2546 state. Possible states are:
2547 added
2549 Versioned in the working copy but not in the previous revision.
2550 removed
2552 Versioned in the previous revision but removed or deleted
2553 in the working copy.
2554 renamed
2556 Path of this file changed from the previous revision;
2557 the text may also have changed. This includes files whose
2558 parent directory was renamed.
2559 modified
2561 Text has changed since the previous revision.
2562 kind changed
2564 File kind has been changed (e.g. from file to directory).
2565 unknown
2567 Not versioned and not matching an ignore pattern.
2568 Additionally for directories, symlinks and files with a changed exe‐
2570 cutable bit, Bazaar indicates their type using a trailing character:
2571 ´/´, ´@´ or ´*´ respectively. These decorations can be disabled using
2572 the ´--no-classify´ option.
2573 To see ignored files use ´bzr ignored´. For details on the changes to
2575 file texts, use ´bzr diff´.
2576 Note that --short or -S gives status flags for each item, similar to
2578 Subversion´s status command. To get output similar to svn -q, use bzr
2579 status -SV.
2580 If no arguments are specified, the status of the entire working direc‐
2582 tory is shown. Otherwise, only the status of the specified files or
2583 directories is reported. If a directory is given, status is reported
2584 for everything inside that directory.
2585 Before merges are committed, the pending merge tip revisions are shown.
2587 To see all pending merge revisions, use the -v option. To skip the
2588 display of pending merge information altogether, use the no-pending
2589 option or specify a file/directory.
2590 To compare the working directory to a specific revision, pass a single
2592 revision to the revision argument.
2593 To see which files have changed in a specific revision, or between two
2595 revisions, pass a revision range to the revision argument. This will
2596 produce the same results as calling ´bzr diff --summarize´.
2597 bzr switch [TO_LOCATION]
2600 Options:
2601 --create-branch, -b Create the target branch from this one
2602 before switching to it.
2603 --directory ARG, -d Branch to operate on, instead of working
2604 directory.
2605 --force Switch even if local commits will be
2606 lost.
2607 --help, -h Show help message.
2608 --quiet, -q Only display errors and warnings.
2609 --revision ARG, -r See "help revisionspec" for details.
2610 --usage Show usage message and options.
2611 --verbose, -v Display more information.
2612 Set the branch of a checkout and update.
2614 For lightweight checkouts, this changes the branch being referenced.
2616 For heavyweight checkouts, this checks that there are no local commits
2617 versus the current bound branch, then it makes the local branch a mir‐
2618 ror of the new location and binds to it.
2619 In both cases, the working tree is updated and uncommitted changes are
2621 merged. The user can commit or revert these as they desire.
2622 Pending merges need to be committed or reverted before using switch.
2624 The path to the branch to switch to can be specified relative to the
2626 parent directory of the current branch. For example, if you are cur‐
2627 rently in a checkout of /path/to/branch, specifying ´newbranch´ will
2628 find a branch at /path/to/newbranch.
2629 Bound branches use the nickname of its master branch unless it is set
2631 locally, in which case switching will update the local nickname to be
2632 that of the master.
2633 bzr tag [TAG_NAME]
2636 Options:
2637 --delete Delete this tag rather than placing it.
2638 --directory ARG, -d Branch in which to place the tag.
2639 --force Replace existing tags.
2640 --help, -h Show help message.
2641 --quiet, -q Only display errors and warnings.
2642 --revision ARG, -r See "help revisionspec" for details.
2643 --usage Show usage message and options.
2644 --verbose, -v Display more information.
2645 See also: commit, tags
2647 Create, remove or modify a tag naming a revision.
2649 Tags give human-meaningful names to revisions. Commands that take a -r
2651 (--revision) option can be given -rtag:X, where X is any previously
2652 created tag.
2653 Tags are stored in the branch. Tags are copied from one branch to
2655 another along when you branch, push, pull or merge.
2656 It is an error to give a tag name that already exists unless you pass
2658 --force, in which case the tag is moved to point to the new revision.
2659 To rename a tag (change the name but keep it on the same revsion), run
2661 ``bzr tag new-name -r tag:old-name`` and then ``bzr tag --delete old‐
2662 name``.
2663 If no tag name is specified it will be determined through the ´auto‐
2665 matic_tag_name´ hook. This can e.g. be used to automatically tag
2666 upstream releases by reading configure.ac. See ``bzr help hooks`` for
2667 details.
2668 bzr tags
2671 Options:
2672 --directory ARG, -d Branch whose tags should be displayed.
2673 --help, -h Show help message.
2674 --quiet, -q Only display errors and warnings.
2675 --revision ARG, -r See "help revisionspec" for details.
2676 --show-ids Show internal object ids.
2677 --sort ARG Sort tags by different criteria.
2678 --usage Show usage message and options.
2679 --verbose, -v Display more information.
2680 See also: tag
2682 List tags.
2684 This command shows a table of tag names and the revisions they refer‐
2686 ence.
2687 bzr testament [BRANCH]
2690 Options:
2691 --help, -h Show help message.
2692 --long Produce long-format testament.
2693 --quiet, -q Only display errors and warnings.
2694 --revision ARG, -r See "help revisionspec" for details.
2695 --strict Produce a strict-format testament.
2696 --usage Show usage message and options.
2697 --verbose, -v Display more information.
2698 Show testament (signing-form) of a revision.
2700 bzr unbind
2703 Options:
2704 --directory ARG, -d Branch to operate on, instead of working
2705 directory.
2706 --help, -h Show help message.
2707 --quiet, -q Only display errors and warnings.
2708 --usage Show usage message and options.
2709 --verbose, -v Display more information.
2710 See also: bind, checkouts
2712 Convert the current checkout into a regular branch.
2714 After unbinding, the local branch is considered independent and subse‐
2716 quent commits will be local only.
2717 bzr uncommit [LOCATION]
2720 Options:
2721 --dry-run Don´t actually make changes.
2722 --force Say yes to all questions.
2723 --help, -h Show help message.
2724 --keep-tags Keep tags that point to removed
2725 revisions.
2726 --local Only remove the commits from the local
2727 branch when in a checkout.
2728 --quiet, -q Only display errors and warnings.
2729 --revision ARG, -r See "help revisionspec" for details.
2730 --usage Show usage message and options.
2731 --verbose, -v Display more information.
2732 See also: commit
2734 Remove the last committed revision.
2736 --verbose will print out what is being removed. --dry-run will go
2738 through all the motions, but not actually remove anything.
2739 If --revision is specified, uncommit revisions to leave the branch at
2741 the specified revision. For example, "bzr uncommit -r 15" will leave
2742 the branch at revision 15.
2743 Uncommit leaves the working tree ready for a new commit. The only
2745 change it may make is to restore any pending merges that were present
2746 before the commit.
2747 bzr unshelve [SHELF_ID]
2750 Options:
2751 --action ARG The action to perform.
2752 --apply Apply changes and remove from the shelf.
2753 --delete-only Delete changes without applying them.
2754 --dry-run Show changes, but do not apply or remove
2755 them.
2756 --keep Apply changes but don´t delete them.
2757 --preview Instead of unshelving the changes, show
2758 the diff that would result from
2759 unshelving.
2760 --directory ARG, -d Branch to operate on, instead of working
2761 directory.
2762 --help, -h Show help message.
2763 --quiet, -q Only display errors and warnings.
2764 --usage Show usage message and options.
2765 --verbose, -v Display more information.
2766 See also: shelve
2768 Restore shelved changes.
2770 By default, the most recently shelved changes are restored. However if
2772 you specify a shelf by id those changes will be restored instead. This
2773 works best when the changes don´t depend on each other.
2774 bzr up
2777 Alias for "update", see "bzr update".
2778 bzr update [DIR]
2780 Options:
2781 --help, -h Show help message.
2782 --quiet, -q Only display errors and warnings.
2783 --revision ARG, -r See "help revisionspec" for details.
2784 --show-base Show base revision text in conflicts.
2785 --usage Show usage message and options.
2786 --verbose, -v Display more information.
2787 Alias: up
2789 See also: pull, status-flags, working-trees
2791 Update a working tree to a new revision.
2793 This will perform a merge of the destination revision (the tip of the
2795 branch, or the specified revision) into the working tree, and then make
2796 that revision the basis revision for the working tree.
2797 You can use this to visit an older revision, or to update a working
2799 tree that is out of date from its branch.
2800 If there are any uncommitted changes in the tree, they will be carried
2802 across and remain as uncommitted changes after the update. To discard
2803 these changes, use ´bzr revert´. The uncommitted changes may conflict
2804 with the changes brought in by the change in basis revision.
2805 If the tree´s branch is bound to a master branch, bzr will also update
2807 the branch from the master.
2808 You cannot update just a single file or directory, because each Bazaar
2810 working tree has just a single basis revision. If you want to restore
2811 a file that has been removed locally, use ´bzr revert´ instead of ´bzr
2812 update´. If you want to restore a file to its state in a previous
2813 revision, use ´bzr revert´ with a ´-r´ option, or use ´bzr cat´ to
2814 write out the old content of that file to a new location.
2815 The ´dir´ argument, if given, must be the location of the root of a
2817 working tree to update. By default, the working tree that contains the
2818 current working directory is used.
2819 bzr upgrade [URL]
2822 Options:
2823 --clean Remove the backup.bzr directory if
2824 successful.
2825 --dry-run Show what would be done, but don´t
2826 actually do anything.
2827 --format ARG Upgrade to a specific format. See "bzr
2828 help formats" for details.
2829 --2a Format for the bzr 2.0 series. Uses
2830 group-compress storage. Provides rich
2831 roots which are a one-way transition.
2832 --default Format for the bzr 2.0 series. Uses
2833 group-compress storage. Provides rich
2834 roots which are a one-way transition.
2835 --development-colo The 2a format with experimental support
2836 for colocated branches.
2837 --pack-0.92 Pack-based format used in 1.x series.
2838 Introduced in 0.92. Interoperates with
2839 bzr repositories before 0.92 but cannot
2840 be read by bzr < 0.92.
2841 --help, -h Show help message.
2842 --quiet, -q Only display errors and warnings.
2843 --usage Show usage message and options.
2844 --verbose, -v Display more information.
2845 See also: check, formats, reconcile
2847 Upgrade a repository, branch or working tree to a newer format.
2849 When the default format has changed after a major new release of
2851 Bazaar, you may be informed during certain operations that you should
2852 upgrade. Upgrading to a newer format may improve performance or make
2853 new features available. It may however limit interoperability with
2854 older repositories or with older versions of Bazaar.
2855 If you wish to upgrade to a particular format rather than the current
2857 default, that can be specified using the --format option. As a conse‐
2858 quence, you can use the upgrade command this way to "downgrade" to an
2859 earlier format, though some conversions are a one way process (e.g.
2860 changing from the 1.x default to the 2.x default) so downgrading is not
2861 always possible.
2862 A backup.bzr.~#~ directory is created at the start of the conversion
2864 process (where # is a number). By default, this is left there on com‐
2865 pletion. If the conversion fails, delete the new .bzr directory and
2866 rename this one back in its place. Use the --clean option to ask for
2867 the backup.bzr directory to be removed on successful conversion.
2868 Alternatively, you can delete it by hand if everything looks good
2869 afterwards.
2870 If the location given is a shared repository, dependent branches are
2872 also converted provided the repository converts successfully. If the
2873 conversion of a branch fails, remaining branches are still tried.
2874 For more information on upgrades, see the Bazaar Upgrade Guide,
2876 http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
2877 bzr verify-signatures [LOCATION]
2880 Options:
2881 --acceptable-keys ARG, -k Comma separated list of GPG key patterns
2882 which are acceptable for verification.
2883 --help, -h Show help message.
2884 --quiet, -q Only display errors and warnings.
2885 --revision ARG, -r See "help revisionspec" for details.
2886 --usage Show usage message and options.
2887 --verbose, -v Display more information.
2888 Verify all commit signatures.
2890 Verifies that all commits in the branch are signed by known GnuPG keys.
2892 bzr version
2895 Options:
2896 --help, -h Show help message.
2897 --quiet, -q Only display errors and warnings.
2898 --short Print just the version number.
2899 --usage Show usage message and options.
2900 --verbose, -v Display more information.
2901 Show version of bzr.
2903 bzr version-info [LOCATION]
2906 Options:
2907 --all Include all possible information.
2908 --check-clean Check if tree is clean.
2909 --format ARG Select the output format.
2910 --custom Version info in Custom template-based
2911 format.
2912 --python Version info in Python format.
2913 --rio Version info in RIO (simple text) format
2914 (default).
2915 --help, -h Show help message.
2916 --include-file-revisions Include the last revision for each file.
2917 --include-history Include the revision-history.
2918 --quiet, -q Only display errors and warnings.
2919 --revision ARG, -r See "help revisionspec" for details.
2920 --template ARG Template for the output.
2921 --usage Show usage message and options.
2922 --verbose, -v Display more information.
2923 Show version information about this tree.
2925 You can use this command to add information about version into source
2927 code of an application. The output can be in one of the supported for‐
2928 mats or in a custom format based on a template.
2929 For example:
2931 bzr version-info --custom \
2933 --template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n"
2934 will produce a C header file with formatted string containing the cur‐
2936 rent revision number. Other supported variables in templates are:
2937 * {date} - date of the last revision
2939 * {build_date} - current date
2940 * {revno} - revision number
2941 * {revision_id} - revision id
2942 * {branch_nick} - branch nickname
2943 * {clean} - 0 if the source tree contains uncommitted changes,
2944 otherwise 1
2945 bzr view [FILE...]
2948 Options:
2949 --all Apply list or delete action to all
2950 views.
2951 --delete Delete the view.
2952 --help, -h Show help message.
2953 --name ARG Name of the view to define, list or
2954 delete.
2955 --quiet, -q Only display errors and warnings.
2956 --switch ARG Name of the view to switch to.
2957 --usage Show usage message and options.
2958 --verbose, -v Display more information.
2959 Manage filtered views.
2961 Views provide a mask over the tree so that users can focus on a subset
2963 of a tree when doing their work. After creating a view, commands that
2964 support a list of files - status, diff, commit, etc - effectively have
2965 that list of files implicitly given each time. An explicit list of
2966 files can still be given but those files must be within the current
2967 view.
2968 In most cases, a view has a short life-span: it is created to make a
2970 selected change and is deleted once that change is committed. At other
2971 times, you may wish to create one or more named views and switch
2972 between them.
2973 To disable the current view without deleting it, you can switch to the
2975 pseudo view called ``off``. This can be useful when you need to see the
2976 whole tree for an operation or two (e.g. merge) but want to switch back
2977 to your view after that.
2978 Examples:
2980 To define the current view:
2981 bzr view file1 dir1 ...
2983 To list the current view:
2985 bzr view
2987 To delete the current view:
2989 bzr view --delete
2991 To disable the current view without deleting it:
2993 bzr view --switch off
2995 To define a named view and switch to it:
2997 bzr view --name view-name file1 dir1 ...
2999 To list a named view:
3001 bzr view --name view-name
3003 To delete a named view:
3005 bzr view --name view-name --delete
3007 To switch to a named view:
3009 bzr view --switch view-name
3011 To list all views defined:
3013 bzr view --all
3015 To delete all views:
3017 bzr view --delete --all
3019 bzr whoami [NAME]
3022 Options:
3023 --branch Set identity for the current branch
3024 instead of globally.
3025 --directory ARG, -d Branch to operate on, instead of working
3026 directory.
3027 --email Display email address only.
3028 --help, -h Show help message.
3029 --quiet, -q Only display errors and warnings.
3030 --usage Show usage message and options.
3031 --verbose, -v Display more information.
3032 Show or set bzr user id.
3034 Examples:
3036 Show the email of the current user:
3037 bzr whoami --email
3039 Set the current user:
3041 bzr whoami "Frank Chu <fchu@example.com>"
3043
3046 BZRPATH
3047 Path where bzr is to look for shell plugin external commands.
3048 BZR_EMAIL
3050 E-Mail address of the user. Overrides default user config.
3051 EMAIL E-Mail address of the user. Overrides default user config.
3053 BZR_EDITOR
3055 Editor for editing commit messages
3056 EDITOR Editor for editing commit messages
3058 BZR_PLUGIN_PATH
3060 Paths where bzr should look for plugins
3061 BZR_HOME
3063 Home directory for bzr
3064
3066 ~/.bazaar/bazaar.conf
3067 Contains the user´s default configuration. The section [DEFAULT]
3068 is used to define general configuration that will be applied
3069 everywhere. The section [ALIASES] can be used to create command
3070 aliases for commonly used options.
3071 A typical config file might look something like:
3073 [DEFAULT]
3075 email=John Doe <jdoe@isp.com>
3076 [ALIASES]
3077 commit = commit --strict
3078 log10 = log --short -r -10..-1
3079
3081 http://bazaar.canonical.com/
30822.5.1 2014-06-10 bzr(1)