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 project of Canonical to develop an open source
15 distributed version control system that is powerful, friendly, and
16 scalable. Version control means a system that keeps track of previous
17 revisions of software source code or similar information and helps peo‐
18 ple work on it in teams.
19
21 bzr add [FILE...]
22 Add specified files or directories.
23 bzr alias [NAME]
25 Set/unset and display aliases.
26 bzr annotate FILENAME
28 Show the origin of each line in a file.
29 bzr bind [LOCATION]
31 Convert the current branch into a checkout of the supplied
32 branch.
33 bzr branch FROM_LOCATION [TO_LOCATION]
35 Create a new branch that is a copy of an existing branch.
36 bzr break-lock [LOCATION]
38 Break a dead lock on a repository, branch or working directory.
39 bzr cat FILENAME
41 Write the contents of a file as of a given revision to standard
42 output.
43 bzr check [PATH]
45 Validate working tree structure, branch consistency and reposi‐
46 tory history.
47 bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
49 Create a new checkout of an existing branch.
50 bzr clean-tree
52 Remove unwanted files from working tree.
53 bzr commit [SELECTED...]
55 Commit changes into a new revision.
56 bzr conflicts
58 List files with conflicts.
59 bzr deleted
61 List files deleted in the working tree.
62 bzr diff [FILE...]
64 Show differences in the working tree, between revisions or
65 branches.
66 bzr export DEST [BRANCH_OR_SUBDIR]
68 Export current or past revision to a destination directory or
69 archive.
70 bzr help [TOPIC]
72 Show help on a command or other topic.
73 bzr ignore [NAME_PATTERN...]
75 Ignore specified files or patterns.
76 bzr ignored
78 List ignored files and the patterns that matched them.
79 bzr info [LOCATION]
81 Show information about a working tree, branch or repository.
82 bzr init [LOCATION]
84 Make a directory into a versioned branch.
85 bzr init-repository LOCATION
87 Create a shared repository for branches to share storage space.
88 bzr join TREE
90 Combine a tree into its containing tree.
91 bzr log [FILE...]
93 Show historical log for a branch or subset of a branch.
94 bzr ls [PATH]
96 List files in a tree.
97 bzr merge [LOCATION]
99 Perform a three-way merge.
100 bzr missing [OTHER_BRANCH]
102 Show unmerged/unpulled revisions between two branches.
103 bzr mkdir DIR...
105 Create a new versioned directory.
106 bzr mv [NAMES...]
108 Move or rename a file.
109 bzr nick [NICKNAME]
111 Print or set the branch nickname.
112 bzr pack [BRANCH_OR_REPO]
114 Compress the data within a repository.
115 bzr plugins
117 List the installed plugins.
118 bzr pull [LOCATION]
120 Turn this branch into a mirror of another branch.
121 bzr push [LOCATION]
123 Update a mirror of this branch.
124 bzr reconcile [BRANCH]
126 Reconcile bzr metadata in a branch.
127 bzr reconfigure [LOCATION]
129 Reconfigure the type of a bzr directory.
130 bzr remerge [FILE...]
132 Redo a merge.
133 bzr remove [FILE...]
135 Remove files or directories.
136 bzr remove-tree [LOCATION]
138 Remove the working tree from a given branch/checkout.
139 bzr renames [DIR]
141 Show list of renamed files.
142 bzr resolve [FILE...]
144 Mark a conflict as resolved.
145 bzr revert [FILE...]
147 Revert files to a previous revision.
148 bzr revno [LOCATION]
150 Show current revision number.
151 bzr root [FILENAME]
153 Show the tree root directory.
154 bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
156 Mail or create a merge-directive for submitting changes.
157 bzr serve
159 Run the bzr server.
160 bzr shelve [FILE...]
162 Temporarily set aside some changes from the current tree.
163 bzr sign-my-commits [LOCATION] [COMMITTER]
165 Sign all commits by a given committer.
166 bzr split TREE
168 Split a subdirectory of a tree into a separate tree.
169 bzr status [FILE...]
171 Display status summary.
172 bzr switch [TO_LOCATION]
174 Set the branch of a checkout and update.
175 bzr tag TAG_NAME
177 Create, remove or modify a tag naming a revision.
178 bzr tags
180 List tags.
181 bzr testament [BRANCH]
183 Show testament (signing-form) of a revision.
184 bzr unbind
186 Convert the current checkout into a regular branch.
187 bzr uncommit [LOCATION]
189 Remove the last committed revision.
190 bzr unshelve [SHELF_ID]
192 Restore shelved changes.
193 bzr update [DIR]
195 Update a tree to have the latest code committed to its branch.
196 bzr upgrade [URL]
198 Upgrade branch storage to current format.
199 bzr version
201 Show version of bzr.
202 bzr version-info [LOCATION]
204 Show version information about this tree.
205 bzr view [FILE...]
207 Manage filtered views.
208 bzr whoami [NAME]
210 Show or set bzr user id.
211
213 bzr --help
214 Alias for "help", see "bzr help".
215 bzr -?
217 Alias for "help", see "bzr help".
218 bzr -h
220 Alias for "help", see "bzr help".
221 bzr ?
223 Alias for "help", see "bzr help".
224 bzr add [FILE...]
226 Options:
227 --dry-run Show what would be done, but don´t
228 actually do anything.
229 --file-ids-from ARG Lookup file ids from this tree.
230 --help, -h Show help message.
231 --no-recurse Don´t recursively add the contents of
232 directories.
233 --quiet, -q Only display errors and warnings.
234 --usage Show usage message and options.
235 --verbose, -v Display more information.
236 See also: ignore, remove
238 Add specified files or directories.
240 In non-recursive mode, all the named items are added, regardless of
242 whether they were previously ignored. A warning is given if any of the
243 named files are already versioned.
244 In recursive mode (the default), files are treated the same way but the
246 behaviour for directories is different. Directories that are already
247 versioned do not give a warning. All directories, whether already ver‐
248 sioned or not, are searched for files or subdirectories that are nei‐
249 ther versioned or ignored, and these are added. This search proceeds
250 recursively into versioned directories. If no names are given ´.´ is
251 assumed.
252 Therefore simply saying ´bzr add´ will version all files that are cur‐
254 rently unknown.
255 Adding a file whose parent directory is not versioned will implicitly
257 add the parent, and so on up to the root. This means you should never
258 need to explicitly add a directory, they´ll just get added when you add
259 a file in the directory.
260 --dry-run will show which files would be added, but not actually add
262 them.
263 --file-ids-from will try to use the file ids from the supplied path.
265 It looks up ids trying to find a matching parent directory with the
266 same filename, and then by pure path. This option is rarely needed but
267 can be useful when adding the same logical file into two branches that
268 will be merged later (without showing the two different adds as a con‐
269 flict). It is also useful when merging another project into a subdirec‐
270 tory of this one.
271 Any files matching patterns in the ignore list will not be added unless
273 they are explicitly mentioned.
274 bzr alias [NAME]
277 Options:
278 --help, -h Show help message.
279 --quiet, -q Only display errors and warnings.
280 --remove Remove the alias.
281 --usage Show usage message and options.
282 --verbose, -v Display more information.
283 Set/unset and display aliases.
285 Examples:
287 Show the current aliases:
288 bzr alias
290 Show the alias specified for ´ll´:
292 bzr alias ll
294 Set an alias for ´ll´:
296 bzr alias ll="log --line -r-10..-1"
298 To remove an alias for ´ll´:
300 bzr alias --remove ll
302 bzr ann
305 Alias for "annotate", see "bzr annotate".
306 bzr annotate FILENAME
308 Options:
309 --all Show annotations on all lines.
310 --help, -h Show help message.
311 --long Show commit date in annotations.
312 --quiet, -q Only display errors and warnings.
313 --revision ARG, -r See "help revisionspec" for details.
314 --show-ids Show internal object ids.
315 --usage Show usage message and options.
316 --verbose, -v Display more information.
317 Aliases: ann, blame, praise
319 Show the origin of each line in a file.
321 This prints out the given file with an annotation on the left side
323 indicating which revision, author and date introduced the change.
324 If the origin is the same for a run of consecutive lines, it is shown
326 only at the top, unless the --all option is given.
327 bzr bind [LOCATION]
330 Options:
331 --help, -h Show help message.
332 --quiet, -q Only display errors and warnings.
333 --usage Show usage message and options.
334 --verbose, -v Display more information.
335 See also: checkouts, unbind
337 Convert the current branch into a checkout of the supplied branch.
339 Once converted into a checkout, commits must succeed on the master
341 branch before they will be applied to the local branch.
342 Bound branches use the nickname of its master branch unless it is set
344 locally, in which case binding will update the local nickname to be
345 that of the master.
346 bzr blame
349 Alias for "annotate", see "bzr annotate".
350 bzr branch FROM_LOCATION [TO_LOCATION]
352 Options:
353 --bind Bind new branch to from location.
354 --hardlink Hard-link working tree files where
355 possible.
356 --help, -h Show help message.
357 --no-tree Create a branch without a working-tree.
358 --quiet, -q Only display errors and warnings.
359 --revision ARG, -r See "help revisionspec" for details.
360 --stacked Create a stacked branch referring to the
361 source branch. The new branch will
362 depend on the availability of the source
363 branch for all operations.
364 --standalone Do not use a shared repository, even if
365 available.
366 --switch Switch the checkout in the current
367 directory to the new branch.
368 --usage Show usage message and options.
369 --use-existing-dir By default branch will fail if the
370 target directory exists, but does not
371 already have a control directory. This
372 flag will allow branch to proceed.
373 --verbose, -v Display more information.
374 Aliases: get, clone
376 See also: checkout
378 Create a new branch that is a copy of an existing branch.
380 If the TO_LOCATION is omitted, the last component of the FROM_LOCATION
382 will be used. In other words, "branch ../foo/bar" will attempt to cre‐
383 ate ./bar. If the FROM_LOCATION has no / or path separator embedded,
384 the TO_LOCATION is derived from the FROM_LOCATION by stripping a lead‐
385 ing scheme or drive identifier, if any. For example, "branch
386 lp:foo-bar" will attempt to create ./foo-bar.
387 To retrieve the branch as of a particular revision, supply the --revi‐
389 sion parameter, as in "branch foo/bar -r 5".
390 bzr break-lock [LOCATION]
393 Options:
394 --help, -h Show help message.
395 --quiet, -q Only display errors and warnings.
396 --usage Show usage message and options.
397 --verbose, -v Display more information.
398 Break a dead lock on a repository, branch or working directory.
400 CAUTION: Locks should only be broken when you are sure that the process
402 holding the lock has been stopped.
403 You can get information on what locks are open via the ´bzr info [loca‐
405 tion]´ command.
406 Examples:
408 bzr break-lock
409 bzr break-lock bzr+ssh://example.com/bzr/foo
410 bzr cat FILENAME
413 Options:
414 --filters Apply content filters to display the
415 convenience form.
416 --help, -h Show help message.
417 --name-from-revision The path name in the old tree.
418 --quiet, -q Only display errors and warnings.
419 --revision ARG, -r See "help revisionspec" for details.
420 --usage Show usage message and options.
421 --verbose, -v Display more information.
422 See also: ls
424 Write the contents of a file as of a given revision to standard output.
426 If no revision is nominated, the last revision is used.
428 Note: Take care to redirect standard output when using this command on
430 a binary file.
431 bzr check [PATH]
434 Options:
435 --branch Check the branch related to the current
436 directory.
437 --help, -h Show help message.
438 --quiet, -q Only display errors and warnings.
439 --repo Check the repository related to the
440 current directory.
441 --tree Check the working tree related to the
442 current directory.
443 --usage Show usage message and options.
444 --verbose, -v Display more information.
445 See also: reconcile
447 Validate working tree structure, branch consistency and repository his‐
449 tory.
450 This command checks various invariants about branch and repository
452 storage to detect data corruption or bzr bugs.
453 The working tree and branch checks will only give output if a problem
455 is detected. The output fields of the repository check are:
456 revisions
458 This is just the number of revisions checked. It doesn´t
459 indicate a problem.
460 versionedfiles
462 This is just the number of versionedfiles checked. It
463 doesn´t indicate a problem.
464 unreferenced ancestors
466 Texts that are ancestors of other texts, but
467 are not properly referenced by the revision ancestry. This is a
468 subtle problem that Bazaar can work around.
469 unique file texts
471 This is the total number of unique file contents
472 seen in the checked revisions. It does not indicate a problem.
473 repeated file texts
475 This is the total number of repeated texts seen
476 in the checked revisions. Texts can be repeated when their file
477 entries are modified, but the file contents are not. It does not
478 indicate a problem.
479 If no restrictions are specified, all Bazaar data that is found at the
481 given location will be checked.
482 Examples:
484 Check the tree and branch at ´foo´:
486 bzr check --tree --branch foo
488 Check only the repository at ´bar´:
490 bzr check --repo bar
492 Check everything at ´baz´:
494 bzr check baz
496 bzr checkin
499 Alias for "commit", see "bzr commit".
500 bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
502 Options:
503 --files-from ARG Get file contents from this tree.
504 --hardlink Hard-link working tree files where
505 possible.
506 --help, -h Show help message.
507 --lightweight Perform a lightweight checkout.
508 Lightweight checkouts depend on access
509 to the branch for every operation.
510 Normal checkouts can perform common
511 operations like diff and status without
512 such access, and also support local
513 commits.
514 --quiet, -q Only display errors and warnings.
515 --revision ARG, -r See "help revisionspec" for details.
516 --usage Show usage message and options.
517 --verbose, -v Display more information.
518 Alias: co
520 See also: branch, checkouts
522 Create a new checkout of an existing branch.
524 If BRANCH_LOCATION is omitted, checkout will reconstitute a working
526 tree for the branch found in ´.´. This is useful if you have removed
527 the working tree or if it was never created - i.e. if you pushed the
528 branch to its current location using SFTP.
529 If the TO_LOCATION is omitted, the last component of the BRANCH_LOCA‐
531 TION will be used. In other words, "checkout ../foo/bar" will attempt
532 to create ./bar. If the BRANCH_LOCATION has no / or path separator
533 embedded, the TO_LOCATION is derived from the BRANCH_LOCATION by strip‐
534 ping a leading scheme or drive identifier, if any. For example, "check‐
535 out lp:foo-bar" will attempt to create ./foo-bar.
536 To retrieve the branch as of a particular revision, supply the --revi‐
538 sion parameter, as in "checkout foo/bar -r 5". Note that this will be
539 immediately out of date [so you cannot commit] but it may be useful
540 (i.e. to examine old code.)
541 bzr ci
544 Alias for "commit", see "bzr commit".
545 bzr clean-tree
547 Options:
548 --detritus Delete conflict files, merge backups,
549 and failed selftest dirs.
550 --dry-run Show files to delete instead of deleting
551 them.
552 --force Do not prompt before deleting.
553 --help, -h Show help message.
554 --ignored Delete all ignored files.
555 --quiet, -q Only display errors and warnings.
556 --unknown Delete files unknown to bzr (default).
557 --usage Show usage message and options.
558 --verbose, -v Display more information.
559 Remove unwanted files from working tree.
561 By default, only unknown files, not ignored files, are deleted. Ver‐
563 sioned files are never deleted.
564 Another class is ´detritus´, which includes files emitted by bzr during
566 normal operations and selftests. (The value of these files decreases
567 with time.)
568 If no options are specified, unknown files are deleted. Otherwise,
570 option flags are respected, and may be combined.
571 To check what clean-tree will do, use --dry-run.
573 bzr clone
576 Alias for "branch", see "bzr branch".
577 bzr co
579 Alias for "checkout", see "bzr checkout".
580 bzr commit [SELECTED...]
582 Options:
583 --author ARG Set the author´s name, if it´s different
584 from the committer.
585 --commit-time ARG Manually set a commit time using commit
586 date format, e.g. ´2009-10-10 08:00:00
587 +0100´.
588 --exclude ARG, -x Do not consider changes made to a given
589 path.
590 --file MSGFILE, -F Take commit message from this file.
591 --fixes ARG Mark a bug as being fixed by this
592 revision (see "bzr help bugs").
593 --help, -h Show help message.
594 --local Perform a local commit in a bound
595 branch. Local commits are not pushed to
596 the master branch until a normal commit
597 is performed.
598 --message ARG, -m Description of the new revision.
599 --quiet, -q Only display errors and warnings.
600 --show-diff When no message is supplied, show the
601 diff along with the status summary in
602 the message editor.
603 --strict Refuse to commit if there are unknown
604 files in the working tree.
605 --unchanged Commit even if nothing has changed.
606 --usage Show usage message and options.
607 --verbose, -v Display more information.
608 Aliases: ci, checkin
610 See also: add, bugs, hooks, uncommit
612 Commit changes into a new revision.
614 An explanatory message needs to be given for each commit. This is often
616 done by using the --message option (getting the message from the com‐
617 mand line) or by using the --file option (getting the message from a
618 file). If neither of these options is given, an editor is opened for
619 the user to enter the message. To see the changed files in the boiler‐
620 plate text loaded into the editor, use the --show-diff option.
621 By default, the entire tree is committed and the person doing the com‐
623 mit is assumed to be the author. These defaults can be overridden as
624 explained below.
625 Selective commits:
627 If selected files are specified, only changes to those files are
629 committed. If a directory is specified then the directory and
630 everything within it is committed.
631 When excludes are given, they take precedence over selected files.
633 For example, to commit only changes within foo, but not changes
634 within foo/bar:
635 bzr commit foo -x foo/bar
637 A selective commit after a merge is not yet supported.
639 Custom authors:
641 If the author of the change is not the same person as the committer,
643 you can specify the author´s name using the --author option. The
644 name should be in the same format as a committer-id, e.g.
645 "John Doe <jdoe@example.com>". If there is more than one author of
646 the change you can specify the option multiple times, once for each
647 author.
648 Checks:
650 A common mistake is to forget to add a new file or directory before
652 running the commit command. The --strict option checks for unknown
653 files and aborts the commit if any are found. More advanced pre-com‐
654 mit
655 checks can be implemented by defining hooks. See ``bzr help hooks``
656 for details.
657 Things to note:
659 If you accidentially commit the wrong changes or make a spelling
661 mistake in the commit message say, you can use the uncommit command
662 to undo it. See ``bzr help uncommit`` for details.
663 Hooks can also be configured to run after a commit. This allows you
665 to trigger updates to external systems like bug trackers. The --fixes
666 option can be used to record the association between a revision and
667 one or more bugs. See ``bzr help bugs`` for details.
668 A selective commit may fail in some cases where the committed
670 tree would be invalid. Consider:
671 bzr init foo
673 mkdir foo/bar
674 bzr add foo/bar
675 bzr commit foo -m "committing foo"
676 bzr mv foo/bar foo/baz
677 mkdir foo/bar
678 bzr add foo/bar
679 bzr commit foo/bar -m "committing bar but not baz"
680 In the example above, the last commit will fail by design. This gives
682 the user the opportunity to decide whether they want to commit the
683 rename at the same time, separately first, or not at all. (As a gen‐
684 eral
685 rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
686 bzr conflicts
689 Options:
690 --help, -h Show help message.
691 --quiet, -q Only display errors and warnings.
692 --text List paths of files with text conflicts.
693 --usage Show usage message and options.
694 --verbose, -v Display more information.
695 See also: conflict-types, resolve
697 List files with conflicts.
699 Merge will do its best to combine the changes in two branches, but
701 there are some kinds of problems only a human can fix. When it encoun‐
702 ters those, it will mark a conflict. A conflict means that you need to
703 fix something, before you should commit.
704 Conflicts normally are listed as short, human-readable messages. If
706 --text is supplied, the pathnames of files with text conflicts are
707 listed, instead. (This is useful for editing all files with text con‐
708 flicts.)
709 Use bzr resolve when you have fixed a problem.
711 bzr del
714 Alias for "remove", see "bzr remove".
715 bzr deleted
717 Options:
718 --help, -h Show help message.
719 --quiet, -q Only display errors and warnings.
720 --show-ids Show internal object ids.
721 --usage Show usage message and options.
722 --verbose, -v Display more information.
723 See also: ls, status
725 List files deleted in the working tree.
727 bzr di
731 Alias for "diff", see "bzr diff".
732 bzr dif
734 Alias for "diff", see "bzr diff".
735 bzr diff [FILE...]
737 Options:
738 --change ARG, -c Select changes introduced by the
739 specified revision. See also "help
740 revisionspec".
741 --diff-options ARG Pass these options to the external diff
742 program.
743 --help, -h Show help message.
744 --new ARG Branch/tree to compare to.
745 --old ARG Branch/tree to compare from.
746 --prefix ARG, -p Set prefixes added to old and new
747 filenames, as two values separated by a
748 colon. (eg "old/:new/").
749 --quiet, -q Only display errors and warnings.
750 --revision ARG, -r See "help revisionspec" for details.
751 --usage Show usage message and options.
752 --using ARG Use this command to compare files.
753 --verbose, -v Display more information.
754 Aliases: di, dif
756 See also: status
758 Show differences in the working tree, between revisions or branches.
760 If no arguments are given, all changes for the current tree are listed.
762 If files are given, only the changes in those files are listed. Remote
763 and multiple branches can be compared by using the --old and --new
764 options. If not provided, the default for both is derived from the
765 first argument, if any, or the current tree if no arguments are given.
766 "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and pro‐
768 duces patches suitable for "patch -p1".
769 Exit values:
771 1 - changed
772 2 - unrepresentable changes
773 3 - error
774 0 - no change
775 Examples:
777 Shows the difference in the working tree versus the last commit:
778 bzr diff
780 Difference between the working tree and revision 1:
782 bzr diff -r1
784 Difference between revision 3 and revision 1:
786 bzr diff -r1..3
788 Difference between revision 3 and revision 1 for branch xxx:
790 bzr diff -r1..3 xxx
792 To see the changes introduced in revision X:
794 bzr diff -cX
796 Note that in the case of a merge, the -c option shows the changes
798 compared to the left hand parent. To see the changes against
799 another parent, use:
800 bzr diff -r<chosen_parent>..X
802 The changes introduced by revision 2 (equivalent to -r1..2):
804 bzr diff -c2
806 Show just the differences for file NEWS:
808 bzr diff NEWS
810 Show the differences in working tree xxx for file NEWS:
812 bzr diff xxx/NEWS
814 Show the differences from branch xxx to this working tree:
816 bzr diff --old xxx
818 Show the differences between two branches for file NEWS:
820 bzr diff --old xxx --new yyy NEWS
822 Same as ´bzr diff´ but prefix paths with old/ and new/:
824 bzr diff --prefix old/:new/
826 bzr export DEST [BRANCH_OR_SUBDIR]
829 Options:
830 --filters Apply content filters to export the
831 convenient form.
832 --format ARG Type of file to export to.
833 --help, -h Show help message.
834 --quiet, -q Only display errors and warnings.
835 --revision ARG, -r See "help revisionspec" for details.
836 --root ARG Name of the root directory inside the
837 exported file.
838 --usage Show usage message and options.
839 --verbose, -v Display more information.
840 Export current or past revision to a destination directory or archive.
842 If no revision is specified this exports the last committed revision.
844 Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
846 given, try to find the format with the extension. If no extension is
847 found exports to a directory (equivalent to --format=dir).
848 If root is supplied, it will be used as the root directory inside con‐
850 tainer formats (tar, zip, etc). If it is not supplied it will default
851 to the exported filename. The root option has no effect for ´dir´ for‐
852 mat.
853 If branch is omitted then the branch containing the current working
855 directory will be used.
856 Note: Export of tree with non-ASCII filenames to zip is not supported.
858 ================= =========================
860 Supported formats Autodetected by extension
861 ================= =========================
862 dir (none)
863 tar .tar
864 tbz2 .tar.bz2, .tbz2
865 tgz .tar.gz, .tgz
866 zip .zip
867 ================= =========================
868 bzr get
871 Alias for "branch", see "bzr branch".
872 bzr help [TOPIC]
874 Options:
875 --help, -h Show help message.
876 --long Show help on all commands.
877 --quiet, -q Only display errors and warnings.
878 --usage Show usage message and options.
879 --verbose, -v Display more information.
880 Aliases: ?, --help, -?, -h
882 See also: topics
884 Show help on a command or other topic.
886 bzr ignore [NAME_PATTERN...]
890 Options:
891 --help, -h Show help message.
892 --old-default-rules Write out the ignore rules bzr < 0.9
893 always used.
894 --quiet, -q Only display errors and warnings.
895 --usage Show usage message and options.
896 --verbose, -v Display more information.
897 See also: ignored, patterns, status
899 Ignore specified files or patterns.
901 See ``bzr help patterns`` for details on the syntax of patterns.
903 If a .bzrignore file does not exist, the ignore command will create one
905 and add the specified files or patterns to the newly created file. The
906 ignore command will also automatically add the the use of the ignore
907 command will require an explicit add command.
908 To remove patterns from the ignore list, edit the .bzrignore file.
910 After adding, editing or deleting that file either indirectly by using
911 this command or directly by using an editor, be sure to commit it.
912 Patterns prefixed with ´!´ are exceptions to ignore patterns and take
914 precedence over regular ignores. Such exceptions are used to specify
915 files that should be versioned which would otherwise be ignored.
916 Patterns prefixed with ´!!´ act as regular ignore patterns, but have
918 precedence over the ´!´ exception patterns.
919 Note: ignore patterns containing shell wildcards must be quoted from
921 the shell on Unix.
922 Examples:
924 Ignore the top level Makefile:
925 bzr ignore ./Makefile
927 Ignore .class files in all directories...:
929 bzr ignore "*.class"
931 ...but do not ignore "special.class":
933 bzr ignore "!special.class"
935 Ignore .o files under the lib directory:
937 bzr ignore "lib/**/*.o"
939 Ignore .o files under the lib directory:
941 bzr ignore "RE:lib/.*\.o"
943 Ignore everything but the "debian" toplevel directory:
945 bzr ignore "RE:(?!debian/).*"
947 Ignore everything except the "local" toplevel directory,
949 but always ignore "*~" autosave files, even under local/:
950 bzr ignore "*"
952 bzr ignore "!./local"
953 bzr ignore "!!*~"
954 bzr ignored
957 Options:
958 --help, -h Show help message.
959 --quiet, -q Only display errors and warnings.
960 --usage Show usage message and options.
961 --verbose, -v Display more information.
962 See also: ignore, ls
964 List ignored files and the patterns that matched them.
966 List all the ignored files and the ignore pattern that caused the file
968 to be ignored.
969 Alternatively, to list just the files:
971 bzr ls --ignored
973 bzr info [LOCATION]
976 Options:
977 --help, -h Show help message.
978 --quiet, -q Only display errors and warnings.
979 --usage Show usage message and options.
980 --verbose, -v Display more information.
981 See also: repositories, revno, working-trees
983 Show information about a working tree, branch or repository.
985 This command will show all known locations and formats associated to
987 the tree, branch or repository.
988 In verbose mode, statistical information is included with each report.
990 To see extended statistic information, use a verbosity level of 2 or
991 higher by specifying the verbose option multiple times, e.g. -vv.
992 Branches and working trees will also report any missing revisions.
994 Examples:
996 Display information on the format and related locations:
998 bzr info
1000 Display the above together with extended format information and
1002 basic statistics (like the number of files in the working tree and
1003 number of revisions in the branch and repository):
1004 bzr info -v
1006 Display the above together with number of committers to the branch:
1008 bzr info -vv
1010 bzr init [LOCATION]
1013 Options:
1014 --append-revisions-only Never change revnos or the existing log.
1015 Append revisions to it only.
1016 --create-prefix Create the path leading up to the branch
1017 if it does not already exist.
1018 --format ARG Specify a format for this branch. See
1019 "help formats".
1020 --1.14 A working-tree format that supports
1021 content filtering.
1022 --1.14-rich-root A variant of 1.14 that supports rich-
1023 root data (needed for bzr-svn and bzr-
1024 git).
1025 --2a First format for bzr 2.0 series. Uses
1026 group-compress storage. Provides rich
1027 roots which are a one-way transition.
1028 --default First format for bzr 2.0 series. Uses
1029 group-compress storage. Provides rich
1030 roots which are a one-way transition.
1031 --pack-0.92 New in 0.92: Pack-based format with data
1032 compatible with dirstate-tags format
1033 repositories. Interoperates with bzr
1034 repositories before 0.92 but cannot be
1035 read by bzr < 0.92. Previously called
1036 knitpack-experimental. For more
1037 information, see http://doc.bazaar-
1038 vcs.org/latest/developers/packrepo.html.
1039 --help, -h Show help message.
1040 --quiet, -q Only display errors and warnings.
1041 --usage Show usage message and options.
1042 --verbose, -v Display more information.
1043 See also: branch, checkout, init-repository
1045 Make a directory into a versioned branch.
1047 Use this to create an empty branch, or before importing an existing
1049 project.
1050 If there is a repository in a parent directory of the location, then
1052 the history of the branch will be stored in the repository. Otherwise
1053 init creates a standalone branch which carries its own history in the
1054 .bzr directory.
1055 If there is already a branch at the location but it has no working
1057 tree, the tree can be populated with ´bzr checkout´.
1058 Recipe for importing a tree of files:
1060 cd ~/project
1062 bzr init
1063 bzr add .
1064 bzr status
1065 bzr commit -m "imported project"
1066 bzr init-repo
1069 Alias for "init-repository", see "bzr init-repository".
1070 bzr init-repository LOCATION
1072 Options:
1073 --format ARG Specify a format for this repository.
1074 See "bzr help formats" for details.
1075 --1.14 A working-tree format that supports
1076 content filtering.
1077 --1.14-rich-root A variant of 1.14 that supports rich-
1078 root data (needed for bzr-svn and bzr-
1079 git).
1080 --2a First format for bzr 2.0 series. Uses
1081 group-compress storage. Provides rich
1082 roots which are a one-way transition.
1083 --default First format for bzr 2.0 series. Uses
1084 group-compress storage. Provides rich
1085 roots which are a one-way transition.
1086 --pack-0.92 New in 0.92: Pack-based format with data
1087 compatible with dirstate-tags format
1088 repositories. Interoperates with bzr
1089 repositories before 0.92 but cannot be
1090 read by bzr < 0.92. Previously called
1091 knitpack-experimental. For more
1092 information, see http://doc.bazaar-
1093 vcs.org/latest/developers/packrepo.html.
1094 --help, -h Show help message.
1095 --no-trees Branches in the repository will default
1096 to not having a working tree.
1097 --quiet, -q Only display errors and warnings.
1098 --usage Show usage message and options.
1099 --verbose, -v Display more information.
1100 Alias: init-repo
1102 See also: branch, checkout, init, repositories
1104 Create a shared repository for branches to share storage space.
1106 New branches created under the repository directory will store their
1108 revisions in the repository, not in the branch directory. For branches
1109 with shared history, this reduces the amount of storage needed and
1110 speeds up the creation of new branches.
1111 If the --no-trees option is given then the branches in the repository
1113 will not have working trees by default. They will still exist as
1114 directories on disk, but they will not have separate copies of the
1115 files at a certain revision. This can be useful for repositories that
1116 store branches which are interacted with through checkouts or remote
1117 branches, such as on a server.
1118 Examples:
1120 Create a shared repository holding just branches:
1121 bzr init-repo --no-trees repo
1123 bzr init repo/trunk
1124 Make a lightweight checkout elsewhere:
1126 bzr checkout --lightweight repo/trunk trunk-checkout
1128 cd trunk-checkout
1129 (add files here)
1130 bzr join TREE
1133 Options:
1134 --help, -h Show help message.
1135 --quiet, -q Only display errors and warnings.
1136 --usage Show usage message and options.
1137 --verbose, -v Display more information.
1138 See also: split
1140 Combine a tree into its containing tree.
1142 This command requires the target tree to be in a rich-root format.
1144 The TREE argument should be an independent tree, inside another tree,
1146 but not part of it. (Such trees can be produced by "bzr split", but
1147 also by running "bzr branch" with the target inside a tree.)
1148 The result is a combined tree, with the subtree no longer an indepen‐
1150 dant part. This is marked as a merge of the subtree into the contain‐
1151 ing tree, and all history is preserved.
1152 bzr log [FILE...]
1155 Options:
1156 --change ARG, -c Show just the specified revision. See
1157 also "help revisionspec".
1158 --forward Show from oldest to newest.
1159 --help, -h Show help message.
1160 --include-merges Show merged revisions like --levels 0
1161 does.
1162 --levels N, -n Number of levels to display - 0 for all,
1163 1 for flat.
1164 --limit N, -l Limit the output to the first N
1165 revisions.
1166 --log-format ARG Use specified log format.
1167 --gnu-changelog Format used by GNU ChangeLog files
1168 --line Log format with one line per revision
1169 --long Detailed log format
1170 --short Moderately short log format
1171 --message ARG, -m Show revisions whose message matches
1172 this regular expression.
1173 --quiet, -q Only display errors and warnings.
1174 --revision ARG, -r See "help revisionspec" for details.
1175 --show-diff, -p Show changes made in each revision as a
1176 patch.
1177 --show-ids Show internal object ids.
1178 --timezone ARG Display timezone as local, original, or
1179 utc.
1180 --usage Show usage message and options.
1181 --verbose, -v Show files changed in each revision.
1182 See also: log-formats, revisionspec
1184 Show historical log for a branch or subset of a branch.
1186 log is bzr´s default tool for exploring the history of a branch. The
1188 branch to use is taken from the first parameter. If no parameters are
1189 given, the branch containing the working directory is logged. Here are
1190 some simple examples:
1191 bzr log log the current branch
1193 bzr log foo.py log a file in its branch
1194 bzr log http://server/branch log a branch on a server
1195 The filtering, ordering and information shown for each revision can be
1197 controlled as explained below. By default, all revisions are shown
1198 sorted (topologically) so that newer revisions appear before older ones
1199 and descendants always appear before ancestors. If displayed, merged
1200 revisions are shown indented under the revision in which they were
1201 merged.
1202 Output control:
1204 The log format controls how information about each revision is
1206 displayed. The standard log formats are called ``long``, ``short``
1207 and ``line``. The default is long. See ``bzr help log-formats``
1208 for more details on log formats.
1209 The following options can be used to control what information is
1211 displayed:
1212 -l N display a maximum of N revisions
1214 -n N display N levels of revisions (0 for all, 1 for col‐
1215 lapsed)
1216 -v display a status summary (delta) for each revision
1217 -p display a diff (patch) for each revision
1218 --show-ids display revision-ids (and file-ids), not just revnos
1219 Note that the default number of levels to display is a function of
1221 the
1222 log format. If the -n option is not used, the standard log formats
1223 show
1224 just the top level (mainline).
1225 Status summaries are shown using status flags like A, M, etc. To see
1227 the changes explained using words like ``added`` and ``modified``
1228 instead, use the -vv option.
1229 Ordering control:
1231 To display revisions from oldest to newest, use the --forward option.
1233 In most cases, using this option will have little impact on the total
1234 time taken to produce a log, though --forward does not incrementally
1235 display revisions like --reverse does when it can.
1236 Revision filtering:
1238 The -r option can be used to specify what revision or range of revi‐
1240 sions
1241 to filter against. The various forms are shown below:
1242 -rX display revision X
1244 -rX.. display revision X and later
1245 -r..Y display up to and including revision Y
1246 -rX..Y display from X to Y inclusive
1247 See ``bzr help revisionspec`` for details on how to specify X and Y.
1249 Some common examples are given below:
1250 -r-1 show just the tip
1252 -r-10.. show the last 10 mainline revisions
1253 -rsubmit:.. show what´s new on this branch
1254 -rancestor:path.. show changes since the common ancestor of this
1255 branch and the one at location path
1256 -rdate:yesterday.. show changes since yesterday
1257 When logging a range of revisions using -rX..Y, log starts at
1259 revision Y and searches back in history through the primary
1260 ("left-hand") parents until it finds X. When logging just the
1261 top level (using -n1), an error is reported if X is not found
1262 along the way. If multi-level logging is used (-n0), X may be
1263 a nested merge revision and the log will be truncated accordingly.
1264 Path filtering:
1266 If parameters are given and the first one is not a branch, the log
1268 will be filtered to show only those revisions that changed the
1269 nominated files or directories.
1270 Filenames are interpreted within their historical context. To log a
1272 deleted file, specify a revision range so that the file existed at
1273 the end or start of the range.
1274 Historical context is also important when interpreting pathnames of
1276 renamed files/directories. Consider the following example:
1277 * revision 1: add tutorial.txt
1279 * revision 2: modify tutorial.txt
1280 * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
1281 In this case:
1283 * ``bzr log guide.txt`` will log the file added in revision 1
1285 * ``bzr log tutorial.txt`` will log the new file added in revision 3
1287 * ``bzr log -r2 -p tutorial.txt`` will show the changes made to
1289 the original file in revision 2.
1290 * ``bzr log -r2 -p guide.txt`` will display an error message as there
1292 was no file called guide.txt in revision 2.
1293 Renames are always followed by log. By design, there is no need to
1295 explicitly ask for this (and no way to stop logging a file back
1296 until it was last renamed).
1297 Other filtering:
1299 The --message option can be used for finding revisions that match a
1301 regular expression in a commit message.
1302 Tips & tricks:
1304 GUI tools and IDEs are often better at exploring history than command
1306 line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk
1307 packages
1308 respectively for example. (TortoiseBzr uses qlog for displaying
1309 logs.) See
1310 http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEInte‐
1311 gration.
1312 Web interfaces are often better at exploring history than command
1314 line
1315 tools, particularly for branches on servers. You may prefer Logger‐
1316 head
1317 or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
1318 You may find it useful to add the aliases below to ``bazaar.conf``:
1320 [ALIASES]
1322 tip = log -r-1
1323 top = log -l10 --line
1324 show = log -v -p
1325 ``bzr tip`` will then show the latest revision while ``bzr top``
1327 will show the last 10 mainline revisions. To see the details of a
1328 particular revision X, ``bzr show -rX``.
1329 If you are interested in looking deeper into a particular merge X,
1331 use ``bzr log -n0 -rX``.
1332 ``bzr log -v`` on a branch with lots of history is currently
1334 very slow. A fix for this issue is currently under development.
1335 With or without that fix, it is recommended that a revision range
1336 be given when using the -v option.
1337 bzr has a generic full-text matching plugin, bzr-search, that can be
1339 used to find revisions matching user names, commit messages, etc.
1340 Among other features, this plugin can find all revisions containing
1341 a list of words but not others.
1342 When exploring non-mainline history on large projects with deep
1344 history, the performance of log can be greatly improved by installing
1345 the historycache plugin. This plugin buffers historical information
1346 trading disk space for faster speed.
1347 bzr ls [PATH]
1350 Options:
1351 --from-root Print paths relative to the root of the
1352 branch.
1353 --help, -h Show help message.
1354 --ignored Print ignored files.
1355 --kind ARG List entries of a particular kind: file,
1356 directory, symlink.
1357 --null Write an ascii NUL (\0) separator
1358 between files rather than a newline.
1359 --quiet, -q Only display errors and warnings.
1360 --recursive, -R Recurse into subdirectories.
1361 --revision ARG, -r See "help revisionspec" for details.
1362 --show-ids Show internal object ids.
1363 --unknown Print unknown files.
1364 --usage Show usage message and options.
1365 --verbose, -v Display more information.
1366 --versioned, -V Print versioned files.
1367 See also: cat, status
1369 List files in a tree.
1371 bzr merge [LOCATION]
1375 Options:
1376 --change ARG, -c Select changes introduced by the
1377 specified revision. See also "help
1378 revisionspec".
1379 --directory ARG, -d Branch to merge into, rather than the
1380 one containing the working directory.
1381 --force Merge even if the destination tree has
1382 uncommitted changes.
1383 --help, -h Show help message.
1384 --interactive, -i Select changes interactively.
1385 --merge-type ARG Select a particular merge algorithm.
1386 --diff3 Merge using external diff3
1387 --lca LCA-newness merge
1388 --merge3 Native diff3-style merge
1389 --weave Weave-based merge
1390 --preview Instead of merging, show a diff of the
1391 merge.
1392 --pull If the destination is already completely
1393 merged into the source, pull from the
1394 source rather than merging. When this
1395 happens, you do not need to commit the
1396 result.
1397 --quiet, -q Only display errors and warnings.
1398 --remember Remember the specified location as a
1399 default.
1400 --reprocess Reprocess to reduce spurious conflicts.
1401 --revision ARG, -r See "help revisionspec" for details.
1402 --show-base Show base revision text in conflicts.
1403 --uncommitted Apply uncommitted changes from a working
1404 copy, instead of branch changes.
1405 --usage Show usage message and options.
1406 --verbose, -v Display more information.
1407 See also: remerge, send, status-flags, update
1409 Perform a three-way merge.
1411 The source of the merge can be specified either in the form of a
1413 branch, or in the form of a path to a file containing a merge directive
1414 generated with bzr send. If neither is specified, the default is the
1415 upstream branch or the branch most recently merged using --remember.
1416 When merging a branch, by default the tip will be merged. To pick a
1418 different revision, pass --revision. If you specify two values, the
1419 first will be used as BASE and the second one as OTHER. Merging indi‐
1420 vidual revisions, or a subset of available revisions, like this is com‐
1421 monly referred to as "cherrypicking".
1422 Revision numbers are always relative to the branch being merged.
1424 By default, bzr will try to merge in all new work from the other
1426 branch, automatically determining an appropriate base. If this fails,
1427 you may need to give an explicit base.
1428 Merge will do its best to combine the changes in two branches, but
1430 there are some kinds of problems only a human can fix. When it encoun‐
1431 ters those, it will mark a conflict. A conflict means that you need to
1432 fix something, before you should commit.
1433 Use bzr resolve when you have fixed a problem. See also bzr conflicts.
1435 If there is no default branch set, the first merge will set it. After
1437 that, you can omit the branch to use the default. To change the
1438 default, use --remember. The value will only be saved if the remote
1439 location can be accessed.
1440 The results of the merge are placed into the destination working direc‐
1442 tory, where they can be reviewed (with bzr diff), tested, and then com‐
1443 mitted to record the result of the merge.
1444 merge refuses to run if there are any uncommitted changes, unless
1446 --force is given. The --force option can also be used to create a merge
1447 revision which has more than two parents.
1448 If one would like to merge changes from the working tree of the other
1450 branch without merging any committed revisions, the --uncommitted
1451 option can be given.
1452 To select only some changes to merge, use "merge -i", which will prompt
1454 you to apply each diff hunk and file change, similar to "shelve".
1455 Examples:
1457 To merge the latest revision from bzr.dev:
1458 bzr merge ../bzr.dev
1460 To merge changes up to and including revision 82 from bzr.dev:
1462 bzr merge -r 82 ../bzr.dev
1464 To merge the changes introduced by 82, without previous changes:
1466 bzr merge -r 81..82 ../bzr.dev
1468 To apply a merge directive contained in /tmp/merge:
1470 bzr merge /tmp/merge
1472 To create a merge revision with three parents from two branches
1474 feature1a and feature1b:
1475 bzr merge ../feature1a
1477 bzr merge ../feature1b --force
1478 bzr commit -m ´revision with three parents´
1479 bzr missing [OTHER_BRANCH]
1482 Options:
1483 --help, -h Show help message.
1484 --include-merges Show all revisions in addition to the
1485 mainline ones.
1486 --log-format ARG Use specified log format.
1487 --gnu-changelog Format used by GNU ChangeLog files
1488 --line Log format with one line per revision
1489 --long Detailed log format
1490 --short Moderately short log format
1491 --mine-only Display changes in the local branch
1492 only.
1493 --my-revision ARG Filter on local branch revisions
1494 (inclusive). See "help revisionspec" for
1495 details.
1496 --other Same as --theirs-only.
1497 --quiet, -q Only display errors and warnings.
1498 --reverse Reverse the order of revisions.
1499 --revision ARG, -r Filter on other branch revisions
1500 (inclusive). See "help revisionspec" for
1501 details.
1502 --show-ids Show internal object ids.
1503 --theirs-only Display changes in the remote branch
1504 only.
1505 --this Same as --mine-only.
1506 --usage Show usage message and options.
1507 --verbose, -v Display more information.
1508 See also: merge, pull
1510 Show unmerged/unpulled revisions between two branches.
1512 OTHER_BRANCH may be local or remote.
1514 To filter on a range of revisions, you can use the command -r
1516 begin..end -r revision requests a specific revision, -r ..end or -r
1517 begin.. are also valid.
1518 Exit values:
1520 1 - some missing revisions
1521 0 - no missing revisions
1522 Examples:
1524 Determine the missing revisions between this and the branch at the
1526 remembered pull location:
1527 bzr missing
1529 Determine the missing revisions between this and another branch:
1531 bzr missing http://server/branch
1533 Determine the missing revisions up to a specific revision on the
1535 other
1536 branch:
1537 bzr missing -r ..-10
1539 Determine the missing revisions up to a specific revision on this
1541 branch:
1542 bzr missing --my-revision ..-10
1544 bzr mkdir DIR...
1547 Options:
1548 --help, -h Show help message.
1549 --quiet, -q Only display errors and warnings.
1550 --usage Show usage message and options.
1551 --verbose, -v Display more information.
1552 Create a new versioned directory.
1554 This is equivalent to creating the directory and then adding it.
1556 bzr move
1559 Alias for "mv", see "bzr mv".
1560 bzr mv [NAMES...]
1562 Options:
1563 --after Move only the bzr identifier of the
1564 file, because the file has already been
1565 moved.
1566 --auto Automatically guess renames.
1567 --dry-run Avoid making changes when guessing
1568 renames.
1569 --help, -h Show help message.
1570 --quiet, -q Only display errors and warnings.
1571 --usage Show usage message and options.
1572 --verbose, -v Display more information.
1573 Aliases: move, rename
1575 Move or rename a file.
1577 Usage:
1579 bzr mv OLDNAME NEWNAME
1580 bzr mv SOURCE... DESTINATION
1582 If the last argument is a versioned directory, all the other names are
1584 moved into it. Otherwise, there must be exactly two arguments and the
1585 file is changed to a new name.
1586 If OLDNAME does not exist on the filesystem but is versioned and NEW‐
1588 NAME does exist on the filesystem but is not versioned, mv assumes that
1589 the file has been manually moved and only updates its internal inven‐
1590 tory to reflect that change. The same is valid when moving many SOURCE
1591 files to a DESTINATION.
1592 Files cannot be moved between branches.
1594 bzr nick [NICKNAME]
1597 Options:
1598 --help, -h Show help message.
1599 --quiet, -q Only display errors and warnings.
1600 --usage Show usage message and options.
1601 --verbose, -v Display more information.
1602 See also: info
1604 Print or set the branch nickname.
1606 If unset, the tree root directory name is used as the nickname. To
1608 print the current nickname, execute with no argument.
1609 Bound branches use the nickname of its master branch unless it is set
1611 locally.
1612 bzr pack [BRANCH_OR_REPO]
1615 Options:
1616 --help, -h Show help message.
1617 --quiet, -q Only display errors and warnings.
1618 --usage Show usage message and options.
1619 --verbose, -v Display more information.
1620 See also: repositories
1622 Compress the data within a repository.
1624 bzr plugins
1627 Options:
1628 --help, -h Show help message.
1629 --quiet, -q Only display errors and warnings.
1630 --usage Show usage message and options.
1631 --verbose, -v Display more information.
1632 List the installed plugins.
1634 This command displays the list of installed plugins including version
1636 of plugin and a short description of each.
1637 --verbose shows the path where each plugin is located.
1639 A plugin is an external component for Bazaar that extends the revision
1641 control system, by adding or replacing code in Bazaar. Plugins can do
1642 a variety of things, including overriding commands, adding new com‐
1643 mands, providing additional network transports and customizing log out‐
1644 put.
1645 See the Bazaar web site, http://bazaar-vcs.org, for further information
1647 on plugins including where to find them and how to install them.
1648 Instructions are also provided there on how to write new plugins using
1649 the Python programming language.
1650 bzr praise
1653 Alias for "annotate", see "bzr annotate".
1654 bzr pull [LOCATION]
1656 Options:
1657 --directory ARG, -d Branch to pull into, rather than the one
1658 containing the working directory.
1659 --help, -h Show help message.
1660 --local Perform a local pull in a bound branch.
1661 Local pulls are not applied to the
1662 master branch.
1663 --overwrite Ignore differences between branches and
1664 overwrite unconditionally.
1665 --quiet, -q Only display errors and warnings.
1666 --remember Remember the specified location as a
1667 default.
1668 --revision ARG, -r See "help revisionspec" for details.
1669 --usage Show usage message and options.
1670 --verbose, -v Show logs of pulled revisions.
1671 See also: push, send, status-flags, update
1673 Turn this branch into a mirror of another branch.
1675 By default, this command only works on branches that have not diverged.
1677 Branches are considered diverged if the destination branch´s most
1678 recent commit is one that has not been merged (directly or indirectly)
1679 into the parent.
1680 If branches have diverged, you can use ´bzr merge´ to integrate the
1682 changes from one into the other. Once one branch has merged, the other
1683 should be able to pull it again.
1684 If you want to replace your local changes and just want your branch to
1686 match the remote one, use pull --overwrite. This will work even if the
1687 two branches have diverged.
1688 If there is no default location set, the first pull will set it. After
1690 that, you can omit the location to use the default. To change the
1691 default, use --remember. The value will only be saved if the remote
1692 location can be accessed.
1693 Note: The location can be specified either in the form of a branch, or
1695 in the form of a path to a file containing a merge directive generated
1696 with bzr send.
1697 bzr push [LOCATION]
1700 Options:
1701 --create-prefix Create the path leading up to the branch
1702 if it does not already exist.
1703 --directory ARG, -d Branch to push from, rather than the one
1704 containing the working directory.
1705 --help, -h Show help message.
1706 --overwrite Ignore differences between branches and
1707 overwrite unconditionally.
1708 --quiet, -q Only display errors and warnings.
1709 --remember Remember the specified location as a
1710 default.
1711 --revision ARG, -r See "help revisionspec" for details.
1712 --stacked Create a stacked branch that references
1713 the public location of the parent
1714 branch.
1715 --stacked-on ARG Create a stacked branch that refers to
1716 another branch for the commit history.
1717 Only the work not present in the
1718 referenced branch is included in the
1719 branch created.
1720 --strict Refuse to push if there are uncommitted
1721 changes in the working tree, --no-strict
1722 disables the check.
1723 --usage Show usage message and options.
1724 --use-existing-dir By default push will fail if the target
1725 directory exists, but does not already
1726 have a control directory. This flag
1727 will allow push to proceed.
1728 --verbose, -v Display more information.
1729 See also: pull, update, working-trees
1731 Update a mirror of this branch.
1733 The target branch will not have its working tree populated because this
1735 is both expensive, and is not supported on remote file systems.
1736 Some smart servers or protocols *may* put the working tree in place in
1738 the future.
1739 This command only works on branches that have not diverged. Branches
1741 are considered diverged if the destination branch´s most recent commit
1742 is one that has not been merged (directly or indirectly) by the source
1743 branch.
1744 If branches have diverged, you can use ´bzr push --overwrite´ to
1746 replace the other branch completely, discarding its unmerged changes.
1747 If you want to ensure you have the different changes in the other
1749 branch, do a merge (see bzr help merge) from the other branch, and com‐
1750 mit that. After that you will be able to do a push without ´--over‐
1751 write´.
1752 If there is no default push location set, the first push will set it.
1754 After that, you can omit the location to use the default. To change
1755 the default, use --remember. The value will only be saved if the remote
1756 location can be accessed.
1757 bzr reconcile [BRANCH]
1760 Options:
1761 --help, -h Show help message.
1762 --quiet, -q Only display errors and warnings.
1763 --usage Show usage message and options.
1764 --verbose, -v Display more information.
1765 See also: check
1767 Reconcile bzr metadata in a branch.
1769 This can correct data mismatches that may have been caused by previous
1771 ghost operations or bzr upgrades. You should only need to run this com‐
1772 mand if ´bzr check´ or a bzr developer advises you to run it.
1773 If a second branch is provided, cross-branch reconciliation is also
1775 attempted, which will check that data like the tree root id which was
1776 not present in very early bzr versions is represented correctly in both
1777 branches.
1778 At the same time it is run it may recompress data resulting in a poten‐
1780 tial saving in disk space or performance gain.
1781 The branch *MUST* be on a listable system such as local disk or sftp.
1783 bzr reconfigure [LOCATION]
1786 Options:
1787 --bind-to ARG Branch to bind checkout to.
1788 --force Perform reconfiguration even if local
1789 changes will be lost.
1790 --help, -h Show help message.
1791 --quiet, -q Only display errors and warnings.
1792 --stacked-on ARG Reconfigure a branch to be stacked on
1793 another branch.
1794 --target_type ARG The type to reconfigure the directory
1795 to.
1796 --branch Reconfigure to be an unbound branch with
1797 no working tree.
1798 --checkout Reconfigure to be a bound branch with a
1799 working tree.
1800 --lightweight-checkout Reconfigure to be a lightweight checkout
1801 (with no local history).
1802 --standalone Reconfigure to be a standalone branch
1803 (i.e. stop using shared repository).
1804 --tree Reconfigure to be an unbound branch with
1805 a working tree.
1806 --use-shared Reconfigure to use a shared repository.
1807 --with-no-trees Reconfigure repository to not create
1808 working trees on branches by default.
1809 --with-trees Reconfigure repository to create working
1810 trees on branches by default.
1811 --unstacked Reconfigure a branch to be unstacked.
1812 This may require copying substantial
1813 data into it.
1814 --usage Show usage message and options.
1815 --verbose, -v Display more information.
1816 See also: branches, checkouts, standalone-trees, working-trees
1818 Reconfigure the type of a bzr directory.
1820 A target configuration must be specified.
1822 For checkouts, the bind-to location will be auto-detected if not speci‐
1824 fied. The order of preference is 1. For a lightweight checkout, the
1825 current bound location. 2. For branches that used to be checkouts, the
1826 previously-bound location. 3. The push location. 4. The parent loca‐
1827 tion. If none of these is available, --bind-to must be specified.
1828 bzr remerge [FILE...]
1831 Options:
1832 --help, -h Show help message.
1833 --merge-type ARG Select a particular merge algorithm.
1834 --diff3 Merge using external diff3
1835 --lca LCA-newness merge
1836 --merge3 Native diff3-style merge
1837 --weave Weave-based merge
1838 --quiet, -q Only display errors and warnings.
1839 --reprocess Reprocess to reduce spurious conflicts.
1840 --show-base Show base revision text in conflicts.
1841 --usage Show usage message and options.
1842 --verbose, -v Display more information.
1843 Redo a merge.
1845 Use this if you want to try a different merge technique while resolving
1847 conflicts. Some merge techniques are better than others, and remerge
1848 lets you try different ones on different files.
1849 The options for remerge have the same meaning and defaults as the ones
1851 for merge. The difference is that remerge can (only) be run when there
1852 is a pending merge, and it lets you specify particular files.
1853 Examples:
1855 Re-do the merge of all conflicted files, and show the base text in
1856 conflict regions, in addition to the usual THIS and OTHER texts:
1857 bzr remerge --show-base
1859 Re-do the merge of "foobar", using the weave merge algorithm, with
1861 additional processing to reduce the size of conflict regions:
1862 bzr remerge --merge-type weave --reprocess foobar
1864 bzr remove [FILE...]
1867 Options:
1868 --file-deletion-strategy ARGThe file deletion mode to be used.
1869 --force Delete all the specified files, even if
1870 they can not be recovered and even if
1871 they are non-empty directories.
1872 --keep Delete from bzr but leave the working
1873 copy.
1874 --safe Only delete files if they can be safely
1875 recovered (default).
1876 --help, -h Show help message.
1877 --new Only remove files that have never been
1878 committed.
1879 --quiet, -q Only display errors and warnings.
1880 --usage Show usage message and options.
1881 --verbose, -v Display more information.
1882 Aliases: rm, del
1884 Remove files or directories.
1886 This makes bzr stop tracking changes to the specified files. bzr will
1888 delete them if they can easily be recovered using revert. If no options
1889 or parameters are given bzr will scan for files that are being tracked
1890 by bzr but missing in your tree and stop tracking them for you.
1891 bzr remove-tree [LOCATION]
1894 Options:
1895 --force Remove the working tree even if it has
1896 uncommitted changes.
1897 --help, -h Show help message.
1898 --quiet, -q Only display errors and warnings.
1899 --usage Show usage message and options.
1900 --verbose, -v Display more information.
1901 See also: checkout, working-trees
1903 Remove the working tree from a given branch/checkout.
1905 Since a lightweight checkout is little more than a working tree this
1907 will refuse to run against one.
1908 To re-create the working tree, use "bzr checkout".
1910 bzr rename
1913 Alias for "mv", see "bzr mv".
1914 bzr renames [DIR]
1916 Options:
1917 --help, -h Show help message.
1918 --quiet, -q Only display errors and warnings.
1919 --usage Show usage message and options.
1920 --verbose, -v Display more information.
1921 See also: status
1923 Show list of renamed files.
1925 bzr resolve [FILE...]
1929 Options:
1930 --all Resolve all conflicts in this tree.
1931 --help, -h Show help message.
1932 --quiet, -q Only display errors and warnings.
1933 --usage Show usage message and options.
1934 --verbose, -v Display more information.
1935 Alias: resolved
1937 See also: conflicts
1939 Mark a conflict as resolved.
1941 Merge will do its best to combine the changes in two branches, but
1943 there are some kinds of problems only a human can fix. When it encoun‐
1944 ters those, it will mark a conflict. A conflict means that you need to
1945 fix something, before you should commit.
1946 Once you have fixed a problem, use "bzr resolve" to automatically mark
1948 text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict
1949 as resolved, or "bzr resolve --all" to mark all conflicts as resolved.
1950 bzr resolved
1953 Alias for "resolve", see "bzr resolve".
1954 bzr revert [FILE...]
1956 Options:
1957 --forget-merges Remove pending merge marker, without
1958 changing any files.
1959 --help, -h Show help message.
1960 --no-backup Do not save backups of reverted files.
1961 --quiet, -q Only display errors and warnings.
1962 --revision ARG, -r See "help revisionspec" for details.
1963 --usage Show usage message and options.
1964 --verbose, -v Display more information.
1965 See also: cat, export
1967 Revert files to a previous revision.
1969 Giving a list of files will revert only those files. Otherwise, all
1971 files will be reverted. If the revision is not specified with ´--revi‐
1972 sion´, the last committed revision is used.
1973 To remove only some changes, without reverting to a prior version, use
1975 merge instead. For example, "merge . --revision -2..-3" will remove
1976 the changes introduced by -2, without affecting the changes introduced
1977 by -1. Or to remove certain changes on a hunk-by-hunk basis, see the
1978 Shelf plugin.
1979 By default, any files that have been manually changed will be backed up
1981 first. (Files changed only by merge are not backed up.) Backup files
1982 have ´.~#~´ appended to their name, where # is a number.
1983 When you provide files, you can use their current pathname or the path‐
1985 name from the target revision. So you can use revert to "undelete" a
1986 file by name. If you name a directory, all the contents of that direc‐
1987 tory will be reverted.
1988 If you have newly added files since the target revision, they will be
1990 removed. If the files to be removed have been changed, backups will be
1991 created as above. Directories containing unknown files will not be
1992 deleted.
1993 The working tree contains a list of revisions that have been merged but
1995 not yet committed. These revisions will be included as additional par‐
1996 ents of the next commit. Normally, using revert clears that list as
1997 well as reverting the files. If any files are specified, revert leaves
1998 the list of uncommitted merges alone and reverts only the files. Use
1999 ``bzr revert and ``bzr revert --forget-merges`` to clear the pending
2000 merge list without reverting any files.
2001 Using "bzr revert --forget-merges", it is possible to apply all of the
2003 changes from a branch in a single revision. To do this, perform the
2004 merge as desired. Then doing revert with the "--forget-merges" option
2005 will keep the content of the tree as it was, but it will clear the list
2006 of pending merges. The next commit will then contain all of the
2007 changes that are present in the other branch, but without any other
2008 parent revisions. Because this technique forgets where these changes
2009 originated, it may cause additional conflicts on later merges involving
2010 the same source and target branches.
2011 bzr revno [LOCATION]
2014 Options:
2015 --help, -h Show help message.
2016 --quiet, -q Only display errors and warnings.
2017 --tree Show revno of working tree
2018 --usage Show usage message and options.
2019 --verbose, -v Display more information.
2020 See also: info
2022 Show current revision number.
2024 This is equal to the number of revisions on this branch.
2026 bzr rm
2029 Alias for "remove", see "bzr remove".
2030 bzr root [FILENAME]
2032 Options:
2033 --help, -h Show help message.
2034 --quiet, -q Only display errors and warnings.
2035 --usage Show usage message and options.
2036 --verbose, -v Display more information.
2037 Show the tree root directory.
2039 The root is the nearest enclosing directory with a .bzr control direc‐
2041 tory.
2042 bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
2045 Options:
2046 --body ARG Body for the email.
2047 --format ARG Use the specified output format.
2048 --from ARG, -f Branch to generate the submission from,
2049 rather than the one containing the
2050 working directory.
2051 --help, -h Show help message.
2052 --mail-to ARG Mail the request to this address.
2053 --message ARG, -m Message string.
2054 --no-bundle Do not include a bundle in the merge
2055 directive.
2056 --no-patch Do not include a preview patch in the
2057 merge directive.
2058 --output ARG, -o Write merge directive to this file; use
2059 - for stdout.
2060 --quiet, -q Only display errors and warnings.
2061 --remember Remember submit and public branch.
2062 --revision ARG, -r See "help revisionspec" for details.
2063 --strict Refuse to send if there are uncommitted
2064 changes in the working tree, --no-strict
2065 disables the check.
2066 --usage Show usage message and options.
2067 --verbose, -v Display more information.
2068 See also: merge, pull
2070 Mail or create a merge-directive for submitting changes.
2072 A merge directive provides many things needed for requesting merges:
2074 * A machine-readable description of the merge to perform
2076 * An optional patch that is a preview of the changes requested
2078 * An optional bundle of revision data, so that the changes can be
2080 applied
2081 directly from the merge directive, without retrieving data from a
2082 branch.
2083 `bzr send` creates a compact data set that, when applied using bzr
2085 merge, has the same effect as merging from the source branch.
2086 By default the merge directive is self-contained and can be applied to
2088 any branch containing submit_branch in its ancestory without needing
2089 access to the source branch.
2090 If --no-bundle is specified, then Bazaar doesn´t send the contents of
2092 the revisions, but only a structured request to merge from the pub‐
2093 lic_location. In that case the public_branch is needed and it must be
2094 up-to-date and accessible to the recipient. The public_branch is
2095 always included if known, so that people can check it later.
2096 The submit branch defaults to the parent of the source branch, but can
2098 be overridden. Both submit branch and public branch will be remembered
2099 in branch.conf the first time they are used for a particular branch.
2100 The source branch defaults to that containing the working directory,
2101 but can be changed using --from.
2102 In order to calculate those changes, bzr must analyse the submit
2104 branch. Therefore it is most efficient for the submit branch to be a
2105 local mirror. If a public location is known for the submit_branch,
2106 that location is used in the merge directive.
2107 The default behaviour is to send the merge directive by mail, unless -o
2109 is given, in which case it is sent to a file.
2110 Mail is sent using your preferred mail program. This should be trans‐
2112 parent on Windows (it uses MAPI). On Linux, it requires the xdg-email
2113 utility. If the preferred client can´t be found (or used), your editor
2114 will be used.
2115 To use a specific mail program, set the mail_client configuration
2117 option. (For Thunderbird 1.5, this works around some bugs.) Supported
2118 values for specific clients are "claws", "evolution", "kmail",
2119 "mail.app" (MacOS X´s Mail.app), "mutt", and "thunderbird"; generic
2120 options are "default", "editor", "emacsclient", "mapi", and
2121 "xdg-email". Plugins may also add supported clients.
2122 If mail is being sent, a to address is required. This can be supplied
2124 either on the commandline, by setting the submit_to configuration
2125 option in the branch itself or the child_submit_to configuration option
2126 in the submit branch.
2127 Two formats are currently supported: "4" uses revision bundle format 4
2129 and merge directive format 2. It is significantly faster and smaller
2130 than older formats. It is compatible with Bazaar 0.19 and later. It
2131 is the default. "0.9" uses revision bundle format 0.9 and merge direc‐
2132 tive format 1. It is compatible with Bazaar 0.12 - 0.18.
2133 The merge directives created by bzr send may be applied using bzr merge
2135 or bzr pull by specifying a file containing a merge directive as the
2136 location.
2137 bzr send makes extensive use of public locations to map local locations
2139 into URLs that can be used by other people. See `bzr help configura‐
2140 tion` to set them, and use `bzr info` to display them.
2141 bzr serve
2144 Options:
2145 --allow-writes By default the server is a readonly
2146 server. Supplying --allow-writes
2147 enables write access to the contents of
2148 the served directory and below. Note
2149 that ``bzr serve`` does not perform
2150 authentication, so unless some form of
2151 external authentication is arranged
2152 supplying this option leads to global
2153 uncontrolled write access to your file
2154 system.
2155 --directory ARG Serve contents of this directory.
2156 --help, -h Show help message.
2157 --inet Serve on stdin/out for use from inetd or
2158 sshd.
2159 --port ARG Listen for connections on nominated port
2160 of the form [hostname:]portnumber.
2161 Passing 0 as the port number will result
2162 in a dynamically allocated port. The
2163 default port depends on the protocol.
2164 --protocol ARG Protocol to serve.
2165 --bzr The Bazaar smart server protocol over
2166 TCP. (default port: 4155)
2167 --quiet, -q Only display errors and warnings.
2168 --usage Show usage message and options.
2169 --verbose, -v Display more information.
2170 Alias: server
2172 Run the bzr server.
2174 bzr server
2177 Alias for "serve", see "bzr serve".
2178 bzr shelve [FILE...]
2180 Options:
2181 --all Shelve all changes.
2182 --destroy Destroy removed changes instead of
2183 shelving them.
2184 --help, -h Show help message.
2185 --list List shelved changes.
2186 --message ARG, -m Message string.
2187 --quiet, -q Only display errors and warnings.
2188 --revision ARG, -r See "help revisionspec" for details.
2189 --usage Show usage message and options.
2190 --verbose, -v Display more information.
2191 --writer ARG Method to use for writing diffs.
2192 --plain Plaintext diff output.
2193 See also: unshelve
2195 Temporarily set aside some changes from the current tree.
2197 Shelve allows you to temporarily put changes you´ve made "on the
2199 shelf", ie. out of the way, until a later time when you can bring them
2200 back from the shelf with the ´unshelve´ command. The changes are
2201 stored alongside your working tree, and so they aren´t propagated along
2202 with your branch nor will they survive its deletion.
2203 If shelve --list is specified, previously-shelved changes are listed.
2205 Shelve is intended to help separate several sets of changes that have
2207 been inappropriately mingled. If you just want to get rid of all
2208 changes and you don´t need to restore them later, use revert. If you
2209 want to shelve all text changes at once, use shelve --all.
2210 If filenames are specified, only the changes to those files will be
2212 shelved. Other files will be left untouched.
2213 If a revision is specified, changes since that revision will be
2215 shelved.
2216 You can put multiple items on the shelf, and by default, ´unshelve´
2218 will restore the most recently shelved changes.
2219 bzr sign-my-commits [LOCATION] [COMMITTER]
2222 Options:
2223 --dry-run Don´t actually sign anything, just print
2224 the revisions that would be signed.
2225 --help, -h Show help message.
2226 --quiet, -q Only display errors and warnings.
2227 --usage Show usage message and options.
2228 --verbose, -v Display more information.
2229 Sign all commits by a given committer.
2231 If location is not specified the local tree is used. If committer is
2233 not specified the default committer is used.
2234 This does not sign commits that already have signatures.
2236 bzr split TREE
2239 Options:
2240 --help, -h Show help message.
2241 --quiet, -q Only display errors and warnings.
2242 --usage Show usage message and options.
2243 --verbose, -v Display more information.
2244 See also: join
2246 Split a subdirectory of a tree into a separate tree.
2248 This command will produce a target tree in a format that supports rich
2250 roots, like ´rich-root´ or ´rich-root-pack´. These formats cannot be
2251 converted into earlier formats like ´dirstate-tags´.
2252 The TREE argument should be a subdirectory of a working tree. That
2254 subdirectory will be converted into an independent tree, with its own
2255 branch. Commits in the top-level tree will not apply to the new sub‐
2256 tree.
2257 bzr st
2260 Alias for "status", see "bzr status".
2261 bzr stat
2263 Alias for "status", see "bzr status".
2264 bzr status [FILE...]
2266 Options:
2267 --change ARG, -c Select changes introduced by the
2268 specified revision. See also "help
2269 revisionspec".
2270 --help, -h Show help message.
2271 --no-pending Don´t show pending merges.
2272 --quiet, -q Only display errors and warnings.
2273 --revision ARG, -r See "help revisionspec" for details.
2274 --short, -S Use short status indicators.
2275 --show-ids Show internal object ids.
2276 --usage Show usage message and options.
2277 --verbose, -v Display more information.
2278 --versioned, -V Only show versioned files.
2279 Aliases: st, stat
2281 See also: diff, revert, status-flags
2283 Display status summary.
2285 This reports on versioned and unknown files, reporting them grouped by
2287 state. Possible states are:
2288 added
2290 Versioned in the working copy but not in the previous revision.
2291 removed
2293 Versioned in the previous revision but removed or deleted
2294 in the working copy.
2295 renamed
2297 Path of this file changed from the previous revision;
2298 the text may also have changed. This includes files whose
2299 parent directory was renamed.
2300 modified
2302 Text has changed since the previous revision.
2303 kind changed
2305 File kind has been changed (e.g. from file to directory).
2306 unknown
2308 Not versioned and not matching an ignore pattern.
2309 Additionally for directories, symlinks and files with an executable
2311 bit, Bazaar indicates their type using a trailing character: ´/´, ´@´
2312 or ´*´ respectively.
2313 To see ignored files use ´bzr ignored´. For details on the changes to
2315 file texts, use ´bzr diff´.
2316 Note that --short or -S gives status flags for each item, similar to
2318 Subversion´s status command. To get output similar to svn -q, use bzr
2319 status -SV.
2320 If no arguments are specified, the status of the entire working direc‐
2322 tory is shown. Otherwise, only the status of the specified files or
2323 directories is reported. If a directory is given, status is reported
2324 for everything inside that directory.
2325 Before merges are committed, the pending merge tip revisions are shown.
2327 To see all pending merge revisions, use the -v option. To skip the
2328 display of pending merge information altogether, use the no-pending
2329 option or specify a file/directory.
2330 If a revision argument is given, the status is calculated against that
2332 revision, or between two revisions if two are provided.
2333 bzr switch [TO_LOCATION]
2336 Options:
2337 --create-branch, -b Create the target branch from this one
2338 before switching to it.
2339 --force Switch even if local commits will be
2340 lost.
2341 --help, -h Show help message.
2342 --quiet, -q Only display errors and warnings.
2343 --revision ARG, -r See "help revisionspec" for details.
2344 --usage Show usage message and options.
2345 --verbose, -v Display more information.
2346 Set the branch of a checkout and update.
2348 For lightweight checkouts, this changes the branch being referenced.
2350 For heavyweight checkouts, this checks that there are no local commits
2351 versus the current bound branch, then it makes the local branch a mir‐
2352 ror of the new location and binds to it.
2353 In both cases, the working tree is updated and uncommitted changes are
2355 merged. The user can commit or revert these as they desire.
2356 Pending merges need to be committed or reverted before using switch.
2358 The path to the branch to switch to can be specified relative to the
2360 parent directory of the current branch. For example, if you are cur‐
2361 rently in a checkout of /path/to/branch, specifying ´newbranch´ will
2362 find a branch at /path/to/newbranch.
2363 Bound branches use the nickname of its master branch unless it is set
2365 locally, in which case switching will update the local nickname to be
2366 that of the master.
2367 bzr tag TAG_NAME
2370 Options:
2371 --delete Delete this tag rather than placing it.
2372 --directory ARG, -d Branch in which to place the tag.
2373 --force Replace existing tags.
2374 --help, -h Show help message.
2375 --quiet, -q Only display errors and warnings.
2376 --revision ARG, -r See "help revisionspec" for details.
2377 --usage Show usage message and options.
2378 --verbose, -v Display more information.
2379 See also: commit, tags
2381 Create, remove or modify a tag naming a revision.
2383 Tags give human-meaningful names to revisions. Commands that take a -r
2385 (--revision) option can be given -rtag:X, where X is any previously
2386 created tag.
2387 Tags are stored in the branch. Tags are copied from one branch to
2389 another along when you branch, push, pull or merge.
2390 It is an error to give a tag name that already exists unless you pass
2392 --force, in which case the tag is moved to point to the new revision.
2393 To rename a tag (change the name but keep it on the same revsion), run
2395 ``bzr tag new-name -r tag:old-name`` and then ``bzr tag --delete old‐
2396 name``.
2397 bzr tags
2400 Options:
2401 --directory ARG, -d Branch whose tags should be displayed.
2402 --help, -h Show help message.
2403 --quiet, -q Only display errors and warnings.
2404 --revision ARG, -r See "help revisionspec" for details.
2405 --show-ids Show internal object ids.
2406 --sort ARG Sort tags by different criteria.
2407 "alpha": Sort tags lexicographically
2408 (default). "time": Sort tags
2409 chronologically.
2410 --usage Show usage message and options.
2411 --verbose, -v Display more information.
2412 See also: tag
2414 List tags.
2416 This command shows a table of tag names and the revisions they refer‐
2418 ence.
2419 bzr testament [BRANCH]
2422 Options:
2423 --help, -h Show help message.
2424 --long Produce long-format testament.
2425 --quiet, -q Only display errors and warnings.
2426 --revision ARG, -r See "help revisionspec" for details.
2427 --strict Produce a strict-format testament.
2428 --usage Show usage message and options.
2429 --verbose, -v Display more information.
2430 Show testament (signing-form) of a revision.
2432 bzr unbind
2435 Options:
2436 --help, -h Show help message.
2437 --quiet, -q Only display errors and warnings.
2438 --usage Show usage message and options.
2439 --verbose, -v Display more information.
2440 See also: bind, checkouts
2442 Convert the current checkout into a regular branch.
2444 After unbinding, the local branch is considered independent and subse‐
2446 quent commits will be local only.
2447 bzr uncommit [LOCATION]
2450 Options:
2451 --dry-run Don´t actually make changes.
2452 --force Say yes to all questions.
2453 --help, -h Show help message.
2454 --local Only remove the commits from the local
2455 branch when in a checkout.
2456 --quiet, -q Only display errors and warnings.
2457 --revision ARG, -r See "help revisionspec" for details.
2458 --usage Show usage message and options.
2459 --verbose, -v Display more information.
2460 See also: commit
2462 Remove the last committed revision.
2464 --verbose will print out what is being removed. --dry-run will go
2466 through all the motions, but not actually remove anything.
2467 If --revision is specified, uncommit revisions to leave the branch at
2469 the specified revision. For example, "bzr uncommit -r 15" will leave
2470 the branch at revision 15.
2471 Uncommit leaves the working tree ready for a new commit. The only
2473 change it may make is to restore any pending merges that were present
2474 before the commit.
2475 bzr unshelve [SHELF_ID]
2478 Options:
2479 --action ARG The action to perform.
2480 --apply Apply changes and remove from the shelf.
2481 --delete-only Delete changes without applying them.
2482 --dry-run Show changes, but do not apply or remove
2483 them.
2484 --keep Apply changes but don´t delete them.
2485 --preview Instead of unshelving the changes, show
2486 the diff that would result from
2487 unshelving.
2488 --help, -h Show help message.
2489 --quiet, -q Only display errors and warnings.
2490 --usage Show usage message and options.
2491 --verbose, -v Display more information.
2492 See also: shelve
2494 Restore shelved changes.
2496 By default, the most recently shelved changes are restored. However if
2498 you specify a shelf by id those changes will be restored instead. This
2499 works best when the changes don´t depend on each other.
2500 bzr up
2503 Alias for "update", see "bzr update".
2504 bzr update [DIR]
2506 Options:
2507 --help, -h Show help message.
2508 --quiet, -q Only display errors and warnings.
2509 --revision ARG, -r See "help revisionspec" for details.
2510 --usage Show usage message and options.
2511 --verbose, -v Display more information.
2512 Alias: up
2514 See also: pull, status-flags, working-trees
2516 Update a tree to have the latest code committed to its branch.
2518 This will perform a merge into the working tree, and may generate con‐
2520 flicts. If you have any local changes, you will still need to commit
2521 them after the update for the update to be complete.
2522 If you want to discard your local changes, you can just do a ´bzr
2524 revert´ instead of ´bzr commit´ after the update.
2525 If the tree´s branch is bound to a master branch, it will also update
2527 the branch from the master.
2528 bzr upgrade [URL]
2531 Options:
2532 --format ARG Upgrade to a specific format. See "bzr
2533 help formats" for details.
2534 --1.14 A working-tree format that supports
2535 content filtering.
2536 --1.14-rich-root A variant of 1.14 that supports rich-
2537 root data (needed for bzr-svn and bzr-
2538 git).
2539 --2a First format for bzr 2.0 series. Uses
2540 group-compress storage. Provides rich
2541 roots which are a one-way transition.
2542 --default First format for bzr 2.0 series. Uses
2543 group-compress storage. Provides rich
2544 roots which are a one-way transition.
2545 --pack-0.92 New in 0.92: Pack-based format with data
2546 compatible with dirstate-tags format
2547 repositories. Interoperates with bzr
2548 repositories before 0.92 but cannot be
2549 read by bzr < 0.92. Previously called
2550 knitpack-experimental. For more
2551 information, see http://doc.bazaar-
2552 vcs.org/latest/developers/packrepo.html.
2553 --help, -h Show help message.
2554 --quiet, -q Only display errors and warnings.
2555 --usage Show usage message and options.
2556 --verbose, -v Display more information.
2557 See also: check
2559 Upgrade branch storage to current format.
2561 The check command or bzr developers may sometimes advise you to run
2563 this command. When the default format has changed you may also be
2564 warned during other operations to upgrade.
2565 bzr version
2568 Options:
2569 --help, -h Show help message.
2570 --quiet, -q Only display errors and warnings.
2571 --short Print just the version number.
2572 --usage Show usage message and options.
2573 --verbose, -v Display more information.
2574 Show version of bzr.
2576 bzr version-info [LOCATION]
2579 Options:
2580 --all Include all possible information.
2581 --check-clean Check if tree is clean.
2582 --format ARG Select the output format.
2583 --custom Version info in Custom template-based
2584 format.
2585 --python Version info in Python format.
2586 --rio Version info in RIO (simple text) format
2587 (default).
2588 --help, -h Show help message.
2589 --include-file-revisions Include the last revision for each file.
2590 --include-history Include the revision-history.
2591 --quiet, -q Only display errors and warnings.
2592 --template ARG Template for the output.
2593 --usage Show usage message and options.
2594 --verbose, -v Display more information.
2595 Show version information about this tree.
2597 You can use this command to add information about version into source
2599 code of an application. The output can be in one of the supported for‐
2600 mats or in a custom format based on a template.
2601 For example:
2603 bzr version-info --custom \
2605 --template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n"
2606 will produce a C header file with formatted string containing the cur‐
2608 rent revision number. Other supported variables in templates are:
2609 * {date} - date of the last revision
2611 * {build_date} - current date
2612 * {revno} - revision number
2613 * {revision_id} - revision id
2614 * {branch_nick} - branch nickname
2615 * {clean} - 0 if the source tree contains uncommitted changes,
2616 otherwise 1
2617 bzr view [FILE...]
2620 Options:
2621 --all Apply list or delete action to all
2622 views.
2623 --delete Delete the view.
2624 --help, -h Show help message.
2625 --name ARG Name of the view to define, list or
2626 delete.
2627 --quiet, -q Only display errors and warnings.
2628 --switch ARG Name of the view to switch to.
2629 --usage Show usage message and options.
2630 --verbose, -v Display more information.
2631 Manage filtered views.
2633 Views provide a mask over the tree so that users can focus on a subset
2635 of a tree when doing their work. After creating a view, commands that
2636 support a list of files - status, diff, commit, etc - effectively have
2637 that list of files implicitly given each time. An explicit list of
2638 files can still be given but those files must be within the current
2639 view.
2640 In most cases, a view has a short life-span: it is created to make a
2642 selected change and is deleted once that change is committed. At other
2643 times, you may wish to create one or more named views and switch
2644 between them.
2645 To disable the current view without deleting it, you can switch to the
2647 pseudo view called ``off``. This can be useful when you need to see the
2648 whole tree for an operation or two (e.g. merge) but want to switch back
2649 to your view after that.
2650 Examples:
2652 To define the current view:
2653 bzr view file1 dir1 ...
2655 To list the current view:
2657 bzr view
2659 To delete the current view:
2661 bzr view --delete
2663 To disable the current view without deleting it:
2665 bzr view --switch off
2667 To define a named view and switch to it:
2669 bzr view --name view-name file1 dir1 ...
2671 To list a named view:
2673 bzr view --name view-name
2675 To delete a named view:
2677 bzr view --name view-name --delete
2679 To switch to a named view:
2681 bzr view --switch view-name
2683 To list all views defined:
2685 bzr view --all
2687 To delete all views:
2689 bzr view --delete --all
2691 bzr whoami [NAME]
2694 Options:
2695 --branch Set identity for the current branch
2696 instead of globally.
2697 --email Display email address only.
2698 --help, -h Show help message.
2699 --quiet, -q Only display errors and warnings.
2700 --usage Show usage message and options.
2701 --verbose, -v Display more information.
2702 Show or set bzr user id.
2704 Examples:
2706 Show the email of the current user:
2707 bzr whoami --email
2709 Set the current user:
2711 bzr whoami "Frank Chu <fchu@example.com>"
2713
2716 BZRPATH
2717 Path where bzr is to look for shell plugin external commands.
2718 BZR_EMAIL
2720 E-Mail address of the user. Overrides default user config.
2721 EMAIL E-Mail address of the user. Overrides default user config.
2723 BZR_EDITOR
2725 Editor for editing commit messages
2726 EDITOR Editor for editing commit messages
2728 BZR_PLUGIN_PATH
2730 Paths where bzr should look for plugins
2731 BZR_HOME
2733 Home directory for bzr
2734
2736 ~/.bazaar/bazaar.conf
2737 Contains the user´s default configuration. The section [DEFAULT]
2738 is used to define general configuration that will be applied
2739 everywhere. The section [ALIASES] can be used to create command
2740 aliases for commonly used options.
2741 A typical config file might look something like:
2743 [DEFAULT]
2745 email=John Doe <jdoe@isp.com>
2746 [ALIASES]
2747 commit = commit --strict
2748 log10 = log --short -r -10..-1
2749
2751 http://www.bazaar-vcs.org/
27522.1.1 2010-11-11 bzr(1)