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 free distrib‐
15 uted version control system that is powerful, friendly, and scalable.
16 Version control means a system that keeps track of previous revisions
17 of software source code or similar information and helps people work on
18 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-branch [LOCATION]
138 Remove a branch.
139 bzr remove-tree [LOCATION...]
141 Remove the working tree from a given branch/checkout.
142 bzr renames [DIR]
144 Show list of renamed files.
145 bzr resolve [FILE...]
147 Mark a conflict as resolved.
148 bzr revert [FILE...]
150 Revert files to a previous revision.
151 bzr revno [LOCATION]
153 Show current revision number.
154 bzr root [FILENAME]
156 Show the tree root directory.
157 bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
159 Mail or create a merge-directive for submitting changes.
160 bzr serve
162 Run the bzr server.
163 bzr shelve [FILE...]
165 Temporarily set aside some changes from the current tree.
166 bzr sign-my-commits [LOCATION] [COMMITTER]
168 Sign all commits by a given committer.
169 bzr split TREE
171 Split a subdirectory of a tree into a separate tree.
172 bzr status [FILE...]
174 Display status summary.
175 bzr switch [TO_LOCATION]
177 Set the branch of a checkout and update.
178 bzr tag [TAG_NAME]
180 Create, remove or modify a tag naming a revision.
181 bzr tags
183 List tags.
184 bzr testament [BRANCH]
186 Show testament (signing-form) of a revision.
187 bzr unbind
189 Convert the current checkout into a regular branch.
190 bzr uncommit [LOCATION]
192 Remove the last committed revision.
193 bzr unshelve [SHELF_ID]
195 Restore shelved changes.
196 bzr update [DIR]
198 Update a tree to have the latest code committed to its branch.
199 bzr upgrade [URL]
201 Upgrade branch storage to current format.
202 bzr version
204 Show version of bzr.
205 bzr version-info [LOCATION]
207 Show version information about this tree.
208 bzr view [FILE...]
210 Manage filtered views.
211 bzr whoami [NAME]
213 Show or set bzr user id.
214
216 bzr --help
217 Alias for "help", see "bzr help".
218 bzr -?
220 Alias for "help", see "bzr help".
221 bzr -h
223 Alias for "help", see "bzr help".
224 bzr ?
226 Alias for "help", see "bzr help".
227 bzr add [FILE...]
229 Options:
230 --dry-run Show what would be done, but don´t
231 actually do anything.
232 --file-ids-from ARG Lookup file ids from this tree.
233 --help, -h Show help message.
234 --no-recurse Don´t recursively add the contents of
235 directories.
236 --quiet, -q Only display errors and warnings.
237 --usage Show usage message and options.
238 --verbose, -v Display more information.
239 See also: ignore, remove
241 Add specified files or directories.
243 In non-recursive mode, all the named items are added, regardless of
245 whether they were previously ignored. A warning is given if any of the
246 named files are already versioned.
247 In recursive mode (the default), files are treated the same way but the
249 behaviour for directories is different. Directories that are already
250 versioned do not give a warning. All directories, whether already ver‐
251 sioned or not, are searched for files or subdirectories that are nei‐
252 ther versioned or ignored, and these are added. This search proceeds
253 recursively into versioned directories. If no names are given ´.´ is
254 assumed.
255 Therefore simply saying ´bzr add´ will version all files that are cur‐
257 rently unknown.
258 Adding a file whose parent directory is not versioned will implicitly
260 add the parent, and so on up to the root. This means you should never
261 need to explicitly add a directory, they´ll just get added when you add
262 a file in the directory.
263 --dry-run will show which files would be added, but not actually add
265 them.
266 --file-ids-from will try to use the file ids from the supplied path.
268 It looks up ids trying to find a matching parent directory with the
269 same filename, and then by pure path. This option is rarely needed but
270 can be useful when adding the same logical file into two branches that
271 will be merged later (without showing the two different adds as a con‐
272 flict). It is also useful when merging another project into a subdirec‐
273 tory of this one.
274 Any files matching patterns in the ignore list will not be added unless
276 they are explicitly mentioned.
277 bzr alias [NAME]
280 Options:
281 --help, -h Show help message.
282 --quiet, -q Only display errors and warnings.
283 --remove Remove the alias.
284 --usage Show usage message and options.
285 --verbose, -v Display more information.
286 Set/unset and display aliases.
288 Examples:
290 Show the current aliases:
291 bzr alias
293 Show the alias specified for ´ll´:
295 bzr alias ll
297 Set an alias for ´ll´:
299 bzr alias ll="log --line -r-10..-1"
301 To remove an alias for ´ll´:
303 bzr alias --remove ll
305 bzr ann
308 Alias for "annotate", see "bzr annotate".
309 bzr annotate FILENAME
311 Options:
312 --all Show annotations on all lines.
313 --directory ARG, -d Branch to operate on, instead of working
314 directory
315 --help, -h Show help message.
316 --long Show commit date in annotations.
317 --quiet, -q Only display errors and warnings.
318 --revision ARG, -r See "help revisionspec" for details.
319 --show-ids Show internal object ids.
320 --usage Show usage message and options.
321 --verbose, -v Display more information.
322 Aliases: ann, blame, praise
324 Show the origin of each line in a file.
326 This prints out the given file with an annotation on the left side
328 indicating which revision, author and date introduced the change.
329 If the origin is the same for a run of consecutive lines, it is shown
331 only at the top, unless the --all option is given.
332 bzr bind [LOCATION]
335 Options:
336 --directory ARG, -d Branch to operate on, instead of working
337 directory
338 --help, -h Show help message.
339 --quiet, -q Only display errors and warnings.
340 --usage Show usage message and options.
341 --verbose, -v Display more information.
342 See also: checkouts, unbind
344 Convert the current branch into a checkout of the supplied branch. If
346 no branch is supplied, rebind to the last bound location.
347 Once converted into a checkout, commits must succeed on the master
349 branch before they will be applied to the local branch.
350 Bound branches use the nickname of its master branch unless it is set
352 locally, in which case binding will update the local nickname to be
353 that of the master.
354 bzr blame
357 Alias for "annotate", see "bzr annotate".
358 bzr branch FROM_LOCATION [TO_LOCATION]
360 Options:
361 --bind Bind new branch to from location.
362 --hardlink Hard-link working tree files where
363 possible.
364 --help, -h Show help message.
365 --no-tree Create a branch without a working-tree.
366 --quiet, -q Only display errors and warnings.
367 --revision ARG, -r See "help revisionspec" for details.
368 --stacked Create a stacked branch referring to the
369 source branch. The new branch will
370 depend on the availability of the source
371 branch for all operations.
372 --standalone Do not use a shared repository, even if
373 available.
374 --switch Switch the checkout in the current
375 directory to the new branch.
376 --usage Show usage message and options.
377 --use-existing-dir By default branch will fail if the
378 target directory exists, but does not
379 already have a control directory. This
380 flag will allow branch to proceed.
381 --verbose, -v Display more information.
382 Aliases: get, clone
384 See also: checkout
386 Create a new branch that is a copy of an existing branch.
388 If the TO_LOCATION is omitted, the last component of the FROM_LOCATION
390 will be used. In other words, "branch ../foo/bar" will attempt to cre‐
391 ate ./bar. If the FROM_LOCATION has no / or path separator embedded,
392 the TO_LOCATION is derived from the FROM_LOCATION by stripping a lead‐
393 ing scheme or drive identifier, if any. For example, "branch
394 lp:foo-bar" will attempt to create ./foo-bar.
395 To retrieve the branch as of a particular revision, supply the --revi‐
397 sion parameter, as in "branch foo/bar -r 5".
398 bzr break-lock [LOCATION]
401 Options:
402 --help, -h Show help message.
403 --quiet, -q Only display errors and warnings.
404 --usage Show usage message and options.
405 --verbose, -v Display more information.
406 Break a dead lock on a repository, branch or working directory.
408 CAUTION: Locks should only be broken when you are sure that the process
410 holding the lock has been stopped.
411 You can get information on what locks are open via the ´bzr info [loca‐
413 tion]´ command.
414 Examples:
416 bzr break-lock
417 bzr break-lock bzr+ssh://example.com/bzr/foo
418 bzr cat FILENAME
421 Options:
422 --directory ARG, -d Branch to operate on, instead of working
423 directory
424 --filters Apply content filters to display the
425 convenience form.
426 --help, -h Show help message.
427 --name-from-revision The path name in the old tree.
428 --quiet, -q Only display errors and warnings.
429 --revision ARG, -r See "help revisionspec" for details.
430 --usage Show usage message and options.
431 --verbose, -v Display more information.
432 See also: ls
434 Write the contents of a file as of a given revision to standard output.
436 If no revision is nominated, the last revision is used.
438 Note: Take care to redirect standard output when using this command on
440 a binary file.
441 bzr check [PATH]
444 Options:
445 --branch Check the branch related to the current
446 directory.
447 --help, -h Show help message.
448 --quiet, -q Only display errors and warnings.
449 --repo Check the repository related to the
450 current directory.
451 --tree Check the working tree related to the
452 current directory.
453 --usage Show usage message and options.
454 --verbose, -v Display more information.
455 See also: reconcile
457 Validate working tree structure, branch consistency and repository his‐
459 tory.
460 This command checks various invariants about branch and repository
462 storage to detect data corruption or bzr bugs.
463 The working tree and branch checks will only give output if a problem
465 is detected. The output fields of the repository check are:
466 revisions
468 This is just the number of revisions checked. It doesn´t
469 indicate a problem.
470 versionedfiles
472 This is just the number of versionedfiles checked. It
473 doesn´t indicate a problem.
474 unreferenced ancestors
476 Texts that are ancestors of other texts, but
477 are not properly referenced by the revision ancestry. This is a
478 subtle problem that Bazaar can work around.
479 unique file texts
481 This is the total number of unique file contents
482 seen in the checked revisions. It does not indicate a problem.
483 repeated file texts
485 This is the total number of repeated texts seen
486 in the checked revisions. Texts can be repeated when their file
487 entries are modified, but the file contents are not. It does not
488 indicate a problem.
489 If no restrictions are specified, all Bazaar data that is found at the
491 given location will be checked.
492 Examples:
494 Check the tree and branch at ´foo´:
496 bzr check --tree --branch foo
498 Check only the repository at ´bar´:
500 bzr check --repo bar
502 Check everything at ´baz´:
504 bzr check baz
506 bzr checkin
509 Alias for "commit", see "bzr commit".
510 bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
512 Options:
513 --files-from ARG Get file contents from this tree.
514 --hardlink Hard-link working tree files where
515 possible.
516 --help, -h Show help message.
517 --lightweight Perform a lightweight checkout.
518 Lightweight checkouts depend on access
519 to the branch for every operation.
520 Normal checkouts can perform common
521 operations like diff and status without
522 such access, and also support local
523 commits.
524 --quiet, -q Only display errors and warnings.
525 --revision ARG, -r See "help revisionspec" for details.
526 --usage Show usage message and options.
527 --verbose, -v Display more information.
528 Alias: co
530 See also: branch, checkouts
532 Create a new checkout of an existing branch.
534 If BRANCH_LOCATION is omitted, checkout will reconstitute a working
536 tree for the branch found in ´.´. This is useful if you have removed
537 the working tree or if it was never created - i.e. if you pushed the
538 branch to its current location using SFTP.
539 If the TO_LOCATION is omitted, the last component of the BRANCH_LOCA‐
541 TION will be used. In other words, "checkout ../foo/bar" will attempt
542 to create ./bar. If the BRANCH_LOCATION has no / or path separator
543 embedded, the TO_LOCATION is derived from the BRANCH_LOCATION by strip‐
544 ping a leading scheme or drive identifier, if any. For example, "check‐
545 out lp:foo-bar" will attempt to create ./foo-bar.
546 To retrieve the branch as of a particular revision, supply the --revi‐
548 sion parameter, as in "checkout foo/bar -r 5". Note that this will be
549 immediately out of date [so you cannot commit] but it may be useful
550 (i.e. to examine old code.)
551 bzr ci
554 Alias for "commit", see "bzr commit".
555 bzr clean-tree
557 Options:
558 --detritus Delete conflict files, merge backups,
559 and failed selftest dirs.
560 --directory ARG, -d Branch to operate on, instead of working
561 directory
562 --dry-run Show files to delete instead of deleting
563 them.
564 --force Do not prompt before deleting.
565 --help, -h Show help message.
566 --ignored Delete all ignored files.
567 --quiet, -q Only display errors and warnings.
568 --unknown Delete files unknown to bzr (default).
569 --usage Show usage message and options.
570 --verbose, -v Display more information.
571 Remove unwanted files from working tree.
573 By default, only unknown files, not ignored files, are deleted. Ver‐
575 sioned files are never deleted.
576 Another class is ´detritus´, which includes files emitted by bzr during
578 normal operations and selftests. (The value of these files decreases
579 with time.)
580 If no options are specified, unknown files are deleted. Otherwise,
582 option flags are respected, and may be combined.
583 To check what clean-tree will do, use --dry-run.
585 bzr clone
588 Alias for "branch", see "bzr branch".
589 bzr co
591 Alias for "checkout", see "bzr checkout".
592 bzr commit [SELECTED...]
594 Options:
595 --author ARG Set the author´s name, if it´s different
596 from the committer.
597 --commit-time ARG Manually set a commit time using commit
598 date format, e.g. ´2009-10-10 08:00:00
599 +0100´.
600 --exclude ARG, -x Do not consider changes made to a given
601 path.
602 --file MSGFILE, -F Take commit message from this file.
603 --fixes ARG Mark a bug as being fixed by this
604 revision (see "bzr help bugs").
605 --help, -h Show help message.
606 --local Perform a local commit in a bound
607 branch. Local commits are not pushed to
608 the master branch until a normal commit
609 is performed.
610 --message ARG, -m Description of the new revision.
611 --quiet, -q Only display errors and warnings.
612 --show-diff, -p When no message is supplied, show the
613 diff along with the status summary in
614 the message editor.
615 --strict Refuse to commit if there are unknown
616 files in the working tree.
617 --unchanged Commit even if nothing has changed.
618 --usage Show usage message and options.
619 --verbose, -v Display more information.
620 Aliases: ci, checkin
622 See also: add, bugs, hooks, uncommit
624 Commit changes into a new revision.
626 An explanatory message needs to be given for each commit. This is often
628 done by using the --message option (getting the message from the com‐
629 mand line) or by using the --file option (getting the message from a
630 file). If neither of these options is given, an editor is opened for
631 the user to enter the message. To see the changed files in the boiler‐
632 plate text loaded into the editor, use the --show-diff option.
633 By default, the entire tree is committed and the person doing the com‐
635 mit is assumed to be the author. These defaults can be overridden as
636 explained below.
637 Selective commits:
639 If selected files are specified, only changes to those files are
641 committed. If a directory is specified then the directory and
642 everything within it is committed.
643 When excludes are given, they take precedence over selected files.
645 For example, to commit only changes within foo, but not changes
646 within foo/bar:
647 bzr commit foo -x foo/bar
649 A selective commit after a merge is not yet supported.
651 Custom authors:
653 If the author of the change is not the same person as the committer,
655 you can specify the author´s name using the --author option. The
656 name should be in the same format as a committer-id, e.g.
657 "John Doe <jdoe@example.com>". If there is more than one author of
658 the change you can specify the option multiple times, once for each
659 author.
660 Checks:
662 A common mistake is to forget to add a new file or directory before
664 running the commit command. The --strict option checks for unknown
665 files and aborts the commit if any are found. More advanced pre-com‐
666 mit
667 checks can be implemented by defining hooks. See ``bzr help hooks``
668 for details.
669 Things to note:
671 If you accidentially commit the wrong changes or make a spelling
673 mistake in the commit message say, you can use the uncommit command
674 to undo it. See ``bzr help uncommit`` for details.
675 Hooks can also be configured to run after a commit. This allows you
677 to trigger updates to external systems like bug trackers. The --fixes
678 option can be used to record the association between a revision and
679 one or more bugs. See ``bzr help bugs`` for details.
680 A selective commit may fail in some cases where the committed
682 tree would be invalid. Consider:
683 bzr init foo
685 mkdir foo/bar
686 bzr add foo/bar
687 bzr commit foo -m "committing foo"
688 bzr mv foo/bar foo/baz
689 mkdir foo/bar
690 bzr add foo/bar
691 bzr commit foo/bar -m "committing bar but not baz"
692 In the example above, the last commit will fail by design. This gives
694 the user the opportunity to decide whether they want to commit the
695 rename at the same time, separately first, or not at all. (As a gen‐
696 eral
697 rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
698 bzr conflicts
701 Options:
702 --directory ARG, -d Branch to operate on, instead of working
703 directory
704 --help, -h Show help message.
705 --quiet, -q Only display errors and warnings.
706 --text List paths of files with text conflicts.
707 --usage Show usage message and options.
708 --verbose, -v Display more information.
709 See also: conflict-types, resolve
711 List files with conflicts.
713 Merge will do its best to combine the changes in two branches, but
715 there are some kinds of problems only a human can fix. When it encoun‐
716 ters those, it will mark a conflict. A conflict means that you need to
717 fix something, before you should commit.
718 Conflicts normally are listed as short, human-readable messages. If
720 --text is supplied, the pathnames of files with text conflicts are
721 listed, instead. (This is useful for editing all files with text con‐
722 flicts.)
723 Use bzr resolve when you have fixed a problem.
725 bzr del
728 Alias for "remove", see "bzr remove".
729 bzr deleted
731 Options:
732 --directory ARG, -d Branch to operate on, instead of working
733 directory
734 --help, -h Show help message.
735 --quiet, -q Only display errors and warnings.
736 --show-ids Show internal object ids.
737 --usage Show usage message and options.
738 --verbose, -v Display more information.
739 See also: ls, status
741 List files deleted in the working tree.
743 bzr di
747 Alias for "diff", see "bzr diff".
748 bzr dif
750 Alias for "diff", see "bzr diff".
751 bzr diff [FILE...]
753 Options:
754 --change ARG, -c Select changes introduced by the
755 specified revision. See also "help
756 revisionspec".
757 --diff-options ARG Pass these options to the external diff
758 program.
759 --format ARG Diff format to use.
760 --help, -h Show help message.
761 --new ARG Branch/tree to compare to.
762 --old ARG Branch/tree to compare from.
763 --prefix ARG, -p Set prefixes added to old and new
764 filenames, as two values separated by a
765 colon. (eg "old/:new/").
766 --quiet, -q Only display errors and warnings.
767 --revision ARG, -r See "help revisionspec" for details.
768 --usage Show usage message and options.
769 --using ARG Use this command to compare files.
770 --verbose, -v Display more information.
771 Aliases: di, dif
773 See also: status
775 Show differences in the working tree, between revisions or branches.
777 If no arguments are given, all changes for the current tree are listed.
779 If files are given, only the changes in those files are listed. Remote
780 and multiple branches can be compared by using the --old and --new
781 options. If not provided, the default for both is derived from the
782 first argument, if any, or the current tree if no arguments are given.
783 "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and pro‐
785 duces patches suitable for "patch -p1".
786 Exit values:
788 1 - changed
789 2 - unrepresentable changes
790 3 - error
791 0 - no change
792 Examples:
794 Shows the difference in the working tree versus the last commit:
795 bzr diff
797 Difference between the working tree and revision 1:
799 bzr diff -r1
801 Difference between revision 3 and revision 1:
803 bzr diff -r1..3
805 Difference between revision 3 and revision 1 for branch xxx:
807 bzr diff -r1..3 xxx
809 To see the changes introduced in revision X:
811 bzr diff -cX
813 Note that in the case of a merge, the -c option shows the changes
815 compared to the left hand parent. To see the changes against
816 another parent, use:
817 bzr diff -r<chosen_parent>..X
819 The changes introduced by revision 2 (equivalent to -r1..2):
821 bzr diff -c2
823 Show just the differences for file NEWS:
825 bzr diff NEWS
827 Show the differences in working tree xxx for file NEWS:
829 bzr diff xxx/NEWS
831 Show the differences from branch xxx to this working tree:
833 bzr diff --old xxx
835 Show the differences between two branches for file NEWS:
837 bzr diff --old xxx --new yyy NEWS
839 Same as ´bzr diff´ but prefix paths with old/ and new/:
841 bzr diff --prefix old/:new/
843 bzr export DEST [BRANCH_OR_SUBDIR]
846 Options:
847 --directory ARG, -d Branch to operate on, instead of working
848 directory
849 --filters Apply content filters to export the
850 convenient form.
851 --format ARG Type of file to export to.
852 --help, -h Show help message.
853 --per-file-timestamps Set modification time of files to that
854 of the last revision in which it was
855 changed.
856 --quiet, -q Only display errors and warnings.
857 --revision ARG, -r See "help revisionspec" for details.
858 --root ARG Name of the root directory inside the
859 exported file.
860 --usage Show usage message and options.
861 --verbose, -v Display more information.
862 Export current or past revision to a destination directory or archive.
864 If no revision is specified this exports the last committed revision.
866 Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
868 given, try to find the format with the extension. If no extension is
869 found exports to a directory (equivalent to --format=dir).
870 If root is supplied, it will be used as the root directory inside con‐
872 tainer formats (tar, zip, etc). If it is not supplied it will default
873 to the exported filename. The root option has no effect for ´dir´ for‐
874 mat.
875 If branch is omitted then the branch containing the current working
877 directory will be used.
878 Note: Export of tree with non-ASCII filenames to zip is not supported.
880 ================= =========================
882 Supported formats Autodetected by extension
883 ================= =========================
884 dir (none)
885 tar .tar
886 tbz2 .tar.bz2, .tbz2
887 tgz .tar.gz, .tgz
888 zip .zip
889 ================= =========================
890 bzr get
893 Alias for "branch", see "bzr branch".
894 bzr help [TOPIC]
896 Options:
897 --help, -h Show help message.
898 --long Show help on all commands.
899 --quiet, -q Only display errors and warnings.
900 --usage Show usage message and options.
901 --verbose, -v Display more information.
902 Aliases: ?, --help, -?, -h
904 See also: topics
906 Show help on a command or other topic.
908 bzr ignore [NAME_PATTERN...]
912 Options:
913 --default-rules Display the default ignore rules that
914 bzr uses.
915 --directory ARG, -d Branch to operate on, instead of working
916 directory
917 --help, -h Show help message.
918 --quiet, -q Only display errors and warnings.
919 --usage Show usage message and options.
920 --verbose, -v Display more information.
921 See also: ignored, patterns, status
923 Ignore specified files or patterns.
925 See ``bzr help patterns`` for details on the syntax of patterns.
927 If a .bzrignore file does not exist, the ignore command will create one
929 and add the specified files or patterns to the newly created file. The
930 ignore command will also automatically add the the use of the ignore
931 command will require an explicit add command.
932 To remove patterns from the ignore list, edit the .bzrignore file.
934 After adding, editing or deleting that file either indirectly by using
935 this command or directly by using an editor, be sure to commit it.
936 Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
938 the global ignore file can be found in the application data directory
939 as C:\Documents and Settings\<user>\Application Data\Bazaar\2.0\ignore.
940 Global ignores are not touched by this command. The global ignore file
941 can be edited directly using an editor.
942 Patterns prefixed with ´!´ are exceptions to ignore patterns and take
944 precedence over regular ignores. Such exceptions are used to specify
945 files that should be versioned which would otherwise be ignored.
946 Patterns prefixed with ´!!´ act as regular ignore patterns, but have
948 precedence over the ´!´ exception patterns.
949 Note: ignore patterns containing shell wildcards must be quoted from
951 the shell on Unix.
952 Examples:
954 Ignore the top level Makefile:
955 bzr ignore ./Makefile
957 Ignore .class files in all directories...:
959 bzr ignore "*.class"
961 ...but do not ignore "special.class":
963 bzr ignore "!special.class"
965 Ignore .o files under the lib directory:
967 bzr ignore "lib/**/*.o"
969 Ignore .o files under the lib directory:
971 bzr ignore "RE:lib/.*\.o"
973 Ignore everything but the "debian" toplevel directory:
975 bzr ignore "RE:(?!debian/).*"
977 Ignore everything except the "local" toplevel directory,
979 but always ignore "*~" autosave files, even under local/:
980 bzr ignore "*"
982 bzr ignore "!./local"
983 bzr ignore "!!*~"
984 bzr ignored
987 Options:
988 --directory ARG, -d Branch to operate on, instead of working
989 directory
990 --help, -h Show help message.
991 --quiet, -q Only display errors and warnings.
992 --usage Show usage message and options.
993 --verbose, -v Display more information.
994 See also: ignore, ls
996 List ignored files and the patterns that matched them.
998 List all the ignored files and the ignore pattern that caused the file
1000 to be ignored.
1001 Alternatively, to list just the files:
1003 bzr ls --ignored
1005 bzr info [LOCATION]
1008 Options:
1009 --help, -h Show help message.
1010 --quiet, -q Only display errors and warnings.
1011 --usage Show usage message and options.
1012 --verbose, -v Display more information.
1013 See also: repositories, revno, working-trees
1015 Show information about a working tree, branch or repository.
1017 This command will show all known locations and formats associated to
1019 the tree, branch or repository.
1020 In verbose mode, statistical information is included with each report.
1022 To see extended statistic information, use a verbosity level of 2 or
1023 higher by specifying the verbose option multiple times, e.g. -vv.
1024 Branches and working trees will also report any missing revisions.
1026 Examples:
1028 Display information on the format and related locations:
1030 bzr info
1032 Display the above together with extended format information and
1034 basic statistics (like the number of files in the working tree and
1035 number of revisions in the branch and repository):
1036 bzr info -v
1038 Display the above together with number of committers to the branch:
1040 bzr info -vv
1042 bzr init [LOCATION]
1045 Options:
1046 --append-revisions-only Never change revnos or the existing log.
1047 Append revisions to it only.
1048 --create-prefix Create the path leading up to the branch
1049 if it does not already exist.
1050 --format ARG Specify a format for this branch. See
1051 "help formats".
1052 --1.14 A working-tree format that supports
1053 content filtering.
1054 --1.14-rich-root A variant of 1.14 that supports rich-
1055 root data (needed for bzr-svn and bzr-
1056 git).
1057 --2a First format for bzr 2.0 series. Uses
1058 group-compress storage. Provides rich
1059 roots which are a one-way transition.
1060 --default First format for bzr 2.0 series. Uses
1061 group-compress storage. Provides rich
1062 roots which are a one-way transition.
1063 --pack-0.92 New in 0.92: Pack-based format with data
1064 compatible with dirstate-tags format
1065 repositories. Interoperates with bzr
1066 repositories before 0.92 but cannot be
1067 read by bzr < 0.92.
1068 --help, -h Show help message.
1069 --quiet, -q Only display errors and warnings.
1070 --usage Show usage message and options.
1071 --verbose, -v Display more information.
1072 See also: branch, checkout, init-repository
1074 Make a directory into a versioned branch.
1076 Use this to create an empty branch, or before importing an existing
1078 project.
1079 If there is a repository in a parent directory of the location, then
1081 the history of the branch will be stored in the repository. Otherwise
1082 init creates a standalone branch which carries its own history in the
1083 .bzr directory.
1084 If there is already a branch at the location but it has no working
1086 tree, the tree can be populated with ´bzr checkout´.
1087 Recipe for importing a tree of files:
1089 cd ~/project
1091 bzr init
1092 bzr add .
1093 bzr status
1094 bzr commit -m "imported project"
1095 bzr init-repo
1098 Alias for "init-repository", see "bzr init-repository".
1099 bzr init-repository LOCATION
1101 Options:
1102 --format ARG Specify a format for this repository.
1103 See "bzr help formats" for details.
1104 --1.14 A working-tree format that supports
1105 content filtering.
1106 --1.14-rich-root A variant of 1.14 that supports rich-
1107 root data (needed for bzr-svn and bzr-
1108 git).
1109 --2a First format for bzr 2.0 series. Uses
1110 group-compress storage. Provides rich
1111 roots which are a one-way transition.
1112 --default First format for bzr 2.0 series. Uses
1113 group-compress storage. Provides rich
1114 roots which are a one-way transition.
1115 --pack-0.92 New in 0.92: Pack-based format with data
1116 compatible with dirstate-tags format
1117 repositories. Interoperates with bzr
1118 repositories before 0.92 but cannot be
1119 read by bzr < 0.92.
1120 --help, -h Show help message.
1121 --no-trees Branches in the repository will default
1122 to not having a working tree.
1123 --quiet, -q Only display errors and warnings.
1124 --usage Show usage message and options.
1125 --verbose, -v Display more information.
1126 Alias: init-repo
1128 See also: branch, checkout, init, repositories
1130 Create a shared repository for branches to share storage space.
1132 New branches created under the repository directory will store their
1134 revisions in the repository, not in the branch directory. For branches
1135 with shared history, this reduces the amount of storage needed and
1136 speeds up the creation of new branches.
1137 If the --no-trees option is given then the branches in the repository
1139 will not have working trees by default. They will still exist as
1140 directories on disk, but they will not have separate copies of the
1141 files at a certain revision. This can be useful for repositories that
1142 store branches which are interacted with through checkouts or remote
1143 branches, such as on a server.
1144 Examples:
1146 Create a shared repository holding just branches:
1147 bzr init-repo --no-trees repo
1149 bzr init repo/trunk
1150 Make a lightweight checkout elsewhere:
1152 bzr checkout --lightweight repo/trunk trunk-checkout
1154 cd trunk-checkout
1155 (add files here)
1156 bzr join TREE
1159 Options:
1160 --help, -h Show help message.
1161 --quiet, -q Only display errors and warnings.
1162 --usage Show usage message and options.
1163 --verbose, -v Display more information.
1164 See also: split
1166 Combine a tree into its containing tree.
1168 This command requires the target tree to be in a rich-root format.
1170 The TREE argument should be an independent tree, inside another tree,
1172 but not part of it. (Such trees can be produced by "bzr split", but
1173 also by running "bzr branch" with the target inside a tree.)
1174 The result is a combined tree, with the subtree no longer an indepen‐
1176 dant part. This is marked as a merge of the subtree into the contain‐
1177 ing tree, and all history is preserved.
1178 bzr log [FILE...]
1181 Options:
1182 --authors ARG What names to list as authors - first,
1183 all or committer.
1184 --change ARG, -c Show just the specified revision. See
1185 also "help revisionspec".
1186 --exclude-common-ancestry Display only the revisions that are not
1187 part of both ancestries (require -rX..Y)
1188 --forward Show from oldest to newest.
1189 --help, -h Show help message.
1190 --include-merges Show merged revisions like --levels 0
1191 does.
1192 --levels N, -n Number of levels to display - 0 for all,
1193 1 for flat.
1194 --limit N, -l Limit the output to the first N
1195 revisions.
1196 --log-format ARG Use specified log format.
1197 --gnu-changelog Format used by GNU ChangeLog files
1198 --line Log format with one line per revision
1199 --long Detailed log format
1200 --short Moderately short log format
1201 --message ARG, -m Show revisions whose message matches
1202 this regular expression.
1203 --quiet, -q Only display errors and warnings.
1204 --revision ARG, -r See "help revisionspec" for details.
1205 --show-diff, -p Show changes made in each revision as a
1206 patch.
1207 --show-ids Show internal object ids.
1208 --timezone ARG Display timezone as local, original, or
1209 utc.
1210 --usage Show usage message and options.
1211 --verbose, -v Show files changed in each revision.
1212 See also: log-formats, revisionspec
1214 Show historical log for a branch or subset of a branch.
1216 log is bzr´s default tool for exploring the history of a branch. The
1218 branch to use is taken from the first parameter. If no parameters are
1219 given, the branch containing the working directory is logged. Here are
1220 some simple examples:
1221 bzr log log the current branch
1223 bzr log foo.py log a file in its branch
1224 bzr log http://server/branch log a branch on a server
1225 The filtering, ordering and information shown for each revision can be
1227 controlled as explained below. By default, all revisions are shown
1228 sorted (topologically) so that newer revisions appear before older ones
1229 and descendants always appear before ancestors. If displayed, merged
1230 revisions are shown indented under the revision in which they were
1231 merged.
1232 Output control:
1234 The log format controls how information about each revision is
1236 displayed. The standard log formats are called ``long``, ``short``
1237 and ``line``. The default is long. See ``bzr help log-formats``
1238 for more details on log formats.
1239 The following options can be used to control what information is
1241 displayed:
1242 -l N display a maximum of N revisions
1244 -n N display N levels of revisions (0 for all, 1 for col‐
1245 lapsed)
1246 -v display a status summary (delta) for each revision
1247 -p display a diff (patch) for each revision
1248 --show-ids display revision-ids (and file-ids), not just revnos
1249 Note that the default number of levels to display is a function of
1251 the
1252 log format. If the -n option is not used, the standard log formats
1253 show
1254 just the top level (mainline).
1255 Status summaries are shown using status flags like A, M, etc. To see
1257 the changes explained using words like ``added`` and ``modified``
1258 instead, use the -vv option.
1259 Ordering control:
1261 To display revisions from oldest to newest, use the --forward option.
1263 In most cases, using this option will have little impact on the total
1264 time taken to produce a log, though --forward does not incrementally
1265 display revisions like --reverse does when it can.
1266 Revision filtering:
1268 The -r option can be used to specify what revision or range of revi‐
1270 sions
1271 to filter against. The various forms are shown below:
1272 -rX display revision X
1274 -rX.. display revision X and later
1275 -r..Y display up to and including revision Y
1276 -rX..Y display from X to Y inclusive
1277 See ``bzr help revisionspec`` for details on how to specify X and Y.
1279 Some common examples are given below:
1280 -r-1 show just the tip
1282 -r-10.. show the last 10 mainline revisions
1283 -rsubmit:.. show what´s new on this branch
1284 -rancestor:path.. show changes since the common ancestor of this
1285 branch and the one at location path
1286 -rdate:yesterday.. show changes since yesterday
1287 When logging a range of revisions using -rX..Y, log starts at
1289 revision Y and searches back in history through the primary
1290 ("left-hand") parents until it finds X. When logging just the
1291 top level (using -n1), an error is reported if X is not found
1292 along the way. If multi-level logging is used (-n0), X may be
1293 a nested merge revision and the log will be truncated accordingly.
1294 Path filtering:
1296 If parameters are given and the first one is not a branch, the log
1298 will be filtered to show only those revisions that changed the
1299 nominated files or directories.
1300 Filenames are interpreted within their historical context. To log a
1302 deleted file, specify a revision range so that the file existed at
1303 the end or start of the range.
1304 Historical context is also important when interpreting pathnames of
1306 renamed files/directories. Consider the following example:
1307 * revision 1: add tutorial.txt
1309 * revision 2: modify tutorial.txt
1310 * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
1311 In this case:
1313 * ``bzr log guide.txt`` will log the file added in revision 1
1315 * ``bzr log tutorial.txt`` will log the new file added in revision 3
1317 * ``bzr log -r2 -p tutorial.txt`` will show the changes made to
1319 the original file in revision 2.
1320 * ``bzr log -r2 -p guide.txt`` will display an error message as there
1322 was no file called guide.txt in revision 2.
1323 Renames are always followed by log. By design, there is no need to
1325 explicitly ask for this (and no way to stop logging a file back
1326 until it was last renamed).
1327 Other filtering:
1329 The --message option can be used for finding revisions that match a
1331 regular expression in a commit message.
1332 Tips & tricks:
1334 GUI tools and IDEs are often better at exploring history than command
1336 line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
1337 bzr-explorer shell, or the Loggerhead web interface. See the Plugin
1338 Guide <http://doc.bazaar.canonical.com/plugins/en/> and
1339 <http://wiki.bazaar.canonical.com/IDEIntegration>.
1340 You may find it useful to add the aliases below to ``bazaar.conf``:
1342 [ALIASES]
1344 tip = log -r-1
1345 top = log -l10 --line
1346 show = log -v -p
1347 ``bzr tip`` will then show the latest revision while ``bzr top``
1349 will show the last 10 mainline revisions. To see the details of a
1350 particular revision X, ``bzr show -rX``.
1351 If you are interested in looking deeper into a particular merge X,
1353 use ``bzr log -n0 -rX``.
1354 ``bzr log -v`` on a branch with lots of history is currently
1356 very slow. A fix for this issue is currently under development.
1357 With or without that fix, it is recommended that a revision range
1358 be given when using the -v option.
1359 bzr has a generic full-text matching plugin, bzr-search, that can be
1361 used to find revisions matching user names, commit messages, etc.
1362 Among other features, this plugin can find all revisions containing
1363 a list of words but not others.
1364 When exploring non-mainline history on large projects with deep
1366 history, the performance of log can be greatly improved by installing
1367 the historycache plugin. This plugin buffers historical information
1368 trading disk space for faster speed.
1369 bzr ls [PATH]
1372 Options:
1373 --directory ARG, -d Branch to operate on, instead of working
1374 directory
1375 --from-root Print paths relative to the root of the
1376 branch.
1377 --help, -h Show help message.
1378 --ignored, -i Print ignored files.
1379 --kind ARG, -k List entries of a particular kind: file,
1380 directory, symlink.
1381 --null, -0 Use an ASCII NUL (\0) separator rather
1382 than a newline.
1383 --quiet, -q Only display errors and warnings.
1384 --recursive, -R Recurse into subdirectories.
1385 --revision ARG, -r See "help revisionspec" for details.
1386 --show-ids Show internal object ids.
1387 --unknown, -u Print unknown files.
1388 --usage Show usage message and options.
1389 --verbose, -v Display more information.
1390 --versioned, -V Print versioned files.
1391 See also: cat, status
1393 List files in a tree.
1395 bzr merge [LOCATION]
1399 Options:
1400 --change ARG, -c Select changes introduced by the
1401 specified revision. See also "help
1402 revisionspec".
1403 --directory ARG, -d Branch to merge into, rather than the
1404 one containing the working directory.
1405 --force Merge even if the destination tree has
1406 uncommitted changes.
1407 --help, -h Show help message.
1408 --interactive, -i Select changes interactively.
1409 --merge-type ARG Select a particular merge algorithm.
1410 --diff3 Merge using external diff3
1411 --lca LCA-newness merge
1412 --merge3 Native diff3-style merge
1413 --weave Weave-based merge
1414 --preview Instead of merging, show a diff of the
1415 merge.
1416 --pull If the destination is already completely
1417 merged into the source, pull from the
1418 source rather than merging. When this
1419 happens, you do not need to commit the
1420 result.
1421 --quiet, -q Only display errors and warnings.
1422 --remember Remember the specified location as a
1423 default.
1424 --reprocess Reprocess to reduce spurious conflicts.
1425 --revision ARG, -r See "help revisionspec" for details.
1426 --show-base Show base revision text in conflicts.
1427 --uncommitted Apply uncommitted changes from a working
1428 copy, instead of branch changes.
1429 --usage Show usage message and options.
1430 --verbose, -v Display more information.
1431 See also: remerge, send, status-flags, update
1433 Perform a three-way merge.
1435 The source of the merge can be specified either in the form of a
1437 branch, or in the form of a path to a file containing a merge directive
1438 generated with bzr send. If neither is specified, the default is the
1439 upstream branch or the branch most recently merged using --remember.
1440 When merging a branch, by default the tip will be merged. To pick a
1442 different revision, pass --revision. If you specify two values, the
1443 first will be used as BASE and the second one as OTHER. Merging indi‐
1444 vidual revisions, or a subset of available revisions, like this is com‐
1445 monly referred to as "cherrypicking".
1446 Revision numbers are always relative to the branch being merged.
1448 By default, bzr will try to merge in all new work from the other
1450 branch, automatically determining an appropriate base. If this fails,
1451 you may need to give an explicit base.
1452 Merge will do its best to combine the changes in two branches, but
1454 there are some kinds of problems only a human can fix. When it encoun‐
1455 ters those, it will mark a conflict. A conflict means that you need to
1456 fix something, before you should commit.
1457 Use bzr resolve when you have fixed a problem. See also bzr conflicts.
1459 If there is no default branch set, the first merge will set it. After
1461 that, you can omit the branch to use the default. To change the
1462 default, use --remember. The value will only be saved if the remote
1463 location can be accessed.
1464 The results of the merge are placed into the destination working direc‐
1466 tory, where they can be reviewed (with bzr diff), tested, and then com‐
1467 mitted to record the result of the merge.
1468 merge refuses to run if there are any uncommitted changes, unless
1470 --force is given. The --force option can also be used to create a merge
1471 revision which has more than two parents.
1472 If one would like to merge changes from the working tree of the other
1474 branch without merging any committed revisions, the --uncommitted
1475 option can be given.
1476 To select only some changes to merge, use "merge -i", which will prompt
1478 you to apply each diff hunk and file change, similar to "shelve".
1479 Examples:
1481 To merge the latest revision from bzr.dev:
1482 bzr merge ../bzr.dev
1484 To merge changes up to and including revision 82 from bzr.dev:
1486 bzr merge -r 82 ../bzr.dev
1488 To merge the changes introduced by 82, without previous changes:
1490 bzr merge -r 81..82 ../bzr.dev
1492 To apply a merge directive contained in /tmp/merge:
1494 bzr merge /tmp/merge
1496 To create a merge revision with three parents from two branches
1498 feature1a and feature1b:
1499 bzr merge ../feature1a
1501 bzr merge ../feature1b --force
1502 bzr commit -m ´revision with three parents´
1503 bzr missing [OTHER_BRANCH]
1506 Options:
1507 --directory ARG, -d Branch to operate on, instead of working
1508 directory
1509 --help, -h Show help message.
1510 --include-merges Show all revisions in addition to the
1511 mainline ones.
1512 --log-format ARG Use specified log format.
1513 --gnu-changelog Format used by GNU ChangeLog files
1514 --line Log format with one line per revision
1515 --long Detailed log format
1516 --short Moderately short log format
1517 --mine-only Display changes in the local branch
1518 only.
1519 --my-revision ARG Filter on local branch revisions
1520 (inclusive). See "help revisionspec" for
1521 details.
1522 --other Same as --theirs-only.
1523 --quiet, -q Only display errors and warnings.
1524 --reverse Reverse the order of revisions.
1525 --revision ARG, -r Filter on other branch revisions
1526 (inclusive). See "help revisionspec" for
1527 details.
1528 --show-ids Show internal object ids.
1529 --theirs-only Display changes in the remote branch
1530 only.
1531 --this Same as --mine-only.
1532 --usage Show usage message and options.
1533 --verbose, -v Display more information.
1534 See also: merge, pull
1536 Show unmerged/unpulled revisions between two branches.
1538 OTHER_BRANCH may be local or remote.
1540 To filter on a range of revisions, you can use the command -r
1542 begin..end -r revision requests a specific revision, -r ..end or -r
1543 begin.. are also valid.
1544 Exit values:
1546 1 - some missing revisions
1547 0 - no missing revisions
1548 Examples:
1550 Determine the missing revisions between this and the branch at the
1552 remembered pull location:
1553 bzr missing
1555 Determine the missing revisions between this and another branch:
1557 bzr missing http://server/branch
1559 Determine the missing revisions up to a specific revision on the
1561 other
1562 branch:
1563 bzr missing -r ..-10
1565 Determine the missing revisions up to a specific revision on this
1567 branch:
1568 bzr missing --my-revision ..-10
1570 bzr mkdir DIR...
1573 Options:
1574 --help, -h Show help message.
1575 --quiet, -q Only display errors and warnings.
1576 --usage Show usage message and options.
1577 --verbose, -v Display more information.
1578 Create a new versioned directory.
1580 This is equivalent to creating the directory and then adding it.
1582 bzr move
1585 Alias for "mv", see "bzr mv".
1586 bzr mv [NAMES...]
1588 Options:
1589 --after Move only the bzr identifier of the
1590 file, because the file has already been
1591 moved.
1592 --auto Automatically guess renames.
1593 --dry-run Avoid making changes when guessing
1594 renames.
1595 --help, -h Show help message.
1596 --quiet, -q Only display errors and warnings.
1597 --usage Show usage message and options.
1598 --verbose, -v Display more information.
1599 Aliases: move, rename
1601 Move or rename a file.
1603 Usage:
1605 bzr mv OLDNAME NEWNAME
1606 bzr mv SOURCE... DESTINATION
1608 If the last argument is a versioned directory, all the other names are
1610 moved into it. Otherwise, there must be exactly two arguments and the
1611 file is changed to a new name.
1612 If OLDNAME does not exist on the filesystem but is versioned and NEW‐
1614 NAME does exist on the filesystem but is not versioned, mv assumes that
1615 the file has been manually moved and only updates its internal inven‐
1616 tory to reflect that change. The same is valid when moving many SOURCE
1617 files to a DESTINATION.
1618 Files cannot be moved between branches.
1620 bzr nick [NICKNAME]
1623 Options:
1624 --directory ARG, -d Branch to operate on, instead of working
1625 directory
1626 --help, -h Show help message.
1627 --quiet, -q Only display errors and warnings.
1628 --usage Show usage message and options.
1629 --verbose, -v Display more information.
1630 See also: info
1632 Print or set the branch nickname.
1634 If unset, the tree root directory name is used as the nickname. To
1636 print the current nickname, execute with no argument.
1637 Bound branches use the nickname of its master branch unless it is set
1639 locally.
1640 bzr pack [BRANCH_OR_REPO]
1643 Options:
1644 --clean-obsolete-packs Delete obsolete packs to save disk
1645 space.
1646 --help, -h Show help message.
1647 --quiet, -q Only display errors and warnings.
1648 --usage Show usage message and options.
1649 --verbose, -v Display more information.
1650 See also: repositories
1652 Compress the data within a repository.
1654 This operation compresses the data within a bazaar repository. As
1656 bazaar supports automatic packing of repository, this operation is nor‐
1657 mally not required to be done manually.
1658 During the pack operation, bazaar takes a backup of existing repository
1660 data, i.e. pack files. This backup is eventually removed by bazaar
1661 automatically when it is safe to do so. To save disk space by removing
1662 the backed up pack files, the --clean-obsolete-packs option may be
1663 used.
1664 Warning: If you use --clean-obsolete-packs and your machine crashes
1666 during or immediately after repacking, you may be left with a state
1667 where the deletion has been written to disk but the new packs have not
1668 been. In this case the repository may be unusable.
1669 bzr plugins
1672 Options:
1673 --help, -h Show help message.
1674 --quiet, -q Only display errors and warnings.
1675 --usage Show usage message and options.
1676 --verbose, -v Display more information.
1677 List the installed plugins.
1679 This command displays the list of installed plugins including version
1681 of plugin and a short description of each.
1682 --verbose shows the path where each plugin is located.
1684 A plugin is an external component for Bazaar that extends the revision
1686 control system, by adding or replacing code in Bazaar. Plugins can do
1687 a variety of things, including overriding commands, adding new com‐
1688 mands, providing additional network transports and customizing log out‐
1689 put.
1690 See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plug‐
1692 ins/en/> for further information on plugins including where to find
1693 them and how to install them. Instructions are also provided there on
1694 how to write new plugins using the Python programming language.
1695 bzr praise
1698 Alias for "annotate", see "bzr annotate".
1699 bzr pull [LOCATION]
1701 Options:
1702 --directory ARG, -d Branch to pull into, rather than the one
1703 containing the working directory.
1704 --help, -h Show help message.
1705 --local Perform a local pull in a bound branch.
1706 Local pulls are not applied to the
1707 master branch.
1708 --overwrite Ignore differences between branches and
1709 overwrite unconditionally.
1710 --quiet, -q Only display errors and warnings.
1711 --remember Remember the specified location as a
1712 default.
1713 --revision ARG, -r See "help revisionspec" for details.
1714 --usage Show usage message and options.
1715 --verbose, -v Show logs of pulled revisions.
1716 See also: push, send, status-flags, update
1718 Turn this branch into a mirror of another branch.
1720 By default, this command only works on branches that have not diverged.
1722 Branches are considered diverged if the destination branch´s most
1723 recent commit is one that has not been merged (directly or indirectly)
1724 into the parent.
1725 If branches have diverged, you can use ´bzr merge´ to integrate the
1727 changes from one into the other. Once one branch has merged, the other
1728 should be able to pull it again.
1729 If you want to replace your local changes and just want your branch to
1731 match the remote one, use pull --overwrite. This will work even if the
1732 two branches have diverged.
1733 If there is no default location set, the first pull will set it. After
1735 that, you can omit the location to use the default. To change the
1736 default, use --remember. The value will only be saved if the remote
1737 location can be accessed.
1738 Note: The location can be specified either in the form of a branch, or
1740 in the form of a path to a file containing a merge directive generated
1741 with bzr send.
1742 bzr push [LOCATION]
1745 Options:
1746 --create-prefix Create the path leading up to the branch
1747 if it does not already exist.
1748 --directory ARG, -d Branch to push from, rather than the one
1749 containing the working directory.
1750 --help, -h Show help message.
1751 --overwrite Ignore differences between branches and
1752 overwrite unconditionally.
1753 --quiet, -q Only display errors and warnings.
1754 --remember Remember the specified location as a
1755 default.
1756 --revision ARG, -r See "help revisionspec" for details.
1757 --stacked Create a stacked branch that references
1758 the public location of the parent
1759 branch.
1760 --stacked-on ARG Create a stacked branch that refers to
1761 another branch for the commit history.
1762 Only the work not present in the
1763 referenced branch is included in the
1764 branch created.
1765 --strict Refuse to push if there are uncommitted
1766 changes in the working tree, --no-strict
1767 disables the check.
1768 --usage Show usage message and options.
1769 --use-existing-dir By default push will fail if the target
1770 directory exists, but does not already
1771 have a control directory. This flag
1772 will allow push to proceed.
1773 --verbose, -v Display more information.
1774 See also: pull, update, working-trees
1776 Update a mirror of this branch.
1778 The target branch will not have its working tree populated because this
1780 is both expensive, and is not supported on remote file systems.
1781 Some smart servers or protocols *may* put the working tree in place in
1783 the future.
1784 This command only works on branches that have not diverged. Branches
1786 are considered diverged if the destination branch´s most recent commit
1787 is one that has not been merged (directly or indirectly) by the source
1788 branch.
1789 If branches have diverged, you can use ´bzr push --overwrite´ to
1791 replace the other branch completely, discarding its unmerged changes.
1792 If you want to ensure you have the different changes in the other
1794 branch, do a merge (see bzr help merge) from the other branch, and com‐
1795 mit that. After that you will be able to do a push without ´--over‐
1796 write´.
1797 If there is no default push location set, the first push will set it.
1799 After that, you can omit the location to use the default. To change
1800 the default, use --remember. The value will only be saved if the remote
1801 location can be accessed.
1802 bzr reconcile [BRANCH]
1805 Options:
1806 --help, -h Show help message.
1807 --quiet, -q Only display errors and warnings.
1808 --usage Show usage message and options.
1809 --verbose, -v Display more information.
1810 See also: check
1812 Reconcile bzr metadata in a branch.
1814 This can correct data mismatches that may have been caused by previous
1816 ghost operations or bzr upgrades. You should only need to run this com‐
1817 mand if ´bzr check´ or a bzr developer advises you to run it.
1818 If a second branch is provided, cross-branch reconciliation is also
1820 attempted, which will check that data like the tree root id which was
1821 not present in very early bzr versions is represented correctly in both
1822 branches.
1823 At the same time it is run it may recompress data resulting in a poten‐
1825 tial saving in disk space or performance gain.
1826 The branch *MUST* be on a listable system such as local disk or sftp.
1828 bzr reconfigure [LOCATION]
1831 Options:
1832 --bind-to ARG Branch to bind checkout to.
1833 --force Perform reconfiguration even if local
1834 changes will be lost.
1835 --help, -h Show help message.
1836 --quiet, -q Only display errors and warnings.
1837 --stacked-on ARG Reconfigure a branch to be stacked on
1838 another branch.
1839 --target_type ARG The type to reconfigure the directory
1840 to.
1841 --branch Reconfigure to be an unbound branch with
1842 no working tree.
1843 --checkout Reconfigure to be a bound branch with a
1844 working tree.
1845 --lightweight-checkout Reconfigure to be a lightweight checkout
1846 (with no local history).
1847 --standalone Reconfigure to be a standalone branch
1848 (i.e. stop using shared repository).
1849 --tree Reconfigure to be an unbound branch with
1850 a working tree.
1851 --use-shared Reconfigure to use a shared repository.
1852 --with-no-trees Reconfigure repository to not create
1853 working trees on branches by default.
1854 --with-trees Reconfigure repository to create working
1855 trees on branches by default.
1856 --unstacked Reconfigure a branch to be unstacked.
1857 This may require copying substantial
1858 data into it.
1859 --usage Show usage message and options.
1860 --verbose, -v Display more information.
1861 See also: branches, checkouts, standalone-trees, working-trees
1863 Reconfigure the type of a bzr directory.
1865 A target configuration must be specified.
1867 For checkouts, the bind-to location will be auto-detected if not speci‐
1869 fied. The order of preference is 1. For a lightweight checkout, the
1870 current bound location. 2. For branches that used to be checkouts, the
1871 previously-bound location. 3. The push location. 4. The parent loca‐
1872 tion. If none of these is available, --bind-to must be specified.
1873 bzr remerge [FILE...]
1876 Options:
1877 --help, -h Show help message.
1878 --merge-type ARG Select a particular merge algorithm.
1879 --diff3 Merge using external diff3
1880 --lca LCA-newness merge
1881 --merge3 Native diff3-style merge
1882 --weave Weave-based merge
1883 --quiet, -q Only display errors and warnings.
1884 --reprocess Reprocess to reduce spurious conflicts.
1885 --show-base Show base revision text in conflicts.
1886 --usage Show usage message and options.
1887 --verbose, -v Display more information.
1888 Redo a merge.
1890 Use this if you want to try a different merge technique while resolving
1892 conflicts. Some merge techniques are better than others, and remerge
1893 lets you try different ones on different files.
1894 The options for remerge have the same meaning and defaults as the ones
1896 for merge. The difference is that remerge can (only) be run when there
1897 is a pending merge, and it lets you specify particular files.
1898 Examples:
1900 Re-do the merge of all conflicted files, and show the base text in
1901 conflict regions, in addition to the usual THIS and OTHER texts:
1902 bzr remerge --show-base
1904 Re-do the merge of "foobar", using the weave merge algorithm, with
1906 additional processing to reduce the size of conflict regions:
1907 bzr remerge --merge-type weave --reprocess foobar
1909 bzr remove [FILE...]
1912 Options:
1913 --file-deletion-strategy ARGThe file deletion mode to be used.
1914 --force Delete all the specified files, even if
1915 they can not be recovered and even if
1916 they are non-empty directories.
1917 --keep Delete from bzr but leave the working
1918 copy.
1919 --safe Only delete files if they can be safely
1920 recovered (default).
1921 --help, -h Show help message.
1922 --new Only remove files that have never been
1923 committed.
1924 --quiet, -q Only display errors and warnings.
1925 --usage Show usage message and options.
1926 --verbose, -v Display more information.
1927 Aliases: rm, del
1929 Remove files or directories.
1931 This makes bzr stop tracking changes to the specified files. bzr will
1933 delete them if they can easily be recovered using revert. If no options
1934 or parameters are given bzr will scan for files that are being tracked
1935 by bzr but missing in your tree and stop tracking them for you.
1936 bzr remove-branch [LOCATION]
1939 Options:
1940 --help, -h Show help message.
1941 --quiet, -q Only display errors and warnings.
1942 --usage Show usage message and options.
1943 --verbose, -v Display more information.
1944 Alias: rmbranch
1946 Remove a branch.
1948 This will remove the branch from the specified location but will keep
1950 any working tree or repository in place.
1951 Examples:
1953 Remove the branch at repo/trunk:
1955 bzr remove-branch repo/trunk
1957 bzr remove-tree [LOCATION...]
1960 Options:
1961 --force Remove the working tree even if it has
1962 uncommitted or shelved changes.
1963 --help, -h Show help message.
1964 --quiet, -q Only display errors and warnings.
1965 --usage Show usage message and options.
1966 --verbose, -v Display more information.
1967 See also: checkout, working-trees
1969 Remove the working tree from a given branch/checkout.
1971 Since a lightweight checkout is little more than a working tree this
1973 will refuse to run against one.
1974 To re-create the working tree, use "bzr checkout".
1976 bzr rename
1979 Alias for "mv", see "bzr mv".
1980 bzr renames [DIR]
1982 Options:
1983 --help, -h Show help message.
1984 --quiet, -q Only display errors and warnings.
1985 --usage Show usage message and options.
1986 --verbose, -v Display more information.
1987 See also: status
1989 Show list of renamed files.
1991 bzr resolve [FILE...]
1995 Options:
1996 --action ARG How to resolve the conflict.
1997 --done Marks the conflict as resolved
1998 --take-other Resolve the conflict taking the merged
1999 version into account
2000 --take-this Resolve the conflict preserving the
2001 version in the working tree
2002 --all Resolve all conflicts in this tree.
2003 --directory ARG, -d Branch to operate on, instead of working
2004 directory
2005 --help, -h Show help message.
2006 --quiet, -q Only display errors and warnings.
2007 --usage Show usage message and options.
2008 --verbose, -v Display more information.
2009 Alias: resolved
2011 See also: conflicts
2013 Mark a conflict as resolved.
2015 Merge will do its best to combine the changes in two branches, but
2017 there are some kinds of problems only a human can fix. When it encoun‐
2018 ters those, it will mark a conflict. A conflict means that you need to
2019 fix something, before you should commit.
2020 Once you have fixed a problem, use "bzr resolve" to automatically mark
2022 text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict
2023 as resolved, or "bzr resolve --all" to mark all conflicts as resolved.
2024 bzr resolved
2027 Alias for "resolve", see "bzr resolve".
2028 bzr revert [FILE...]
2030 Options:
2031 --forget-merges Remove pending merge marker, without
2032 changing any files.
2033 --help, -h Show help message.
2034 --no-backup Do not save backups of reverted files.
2035 --quiet, -q Only display errors and warnings.
2036 --revision ARG, -r See "help revisionspec" for details.
2037 --usage Show usage message and options.
2038 --verbose, -v Display more information.
2039 See also: cat, export
2041 Revert files to a previous revision.
2043 Giving a list of files will revert only those files. Otherwise, all
2045 files will be reverted. If the revision is not specified with ´--revi‐
2046 sion´, the last committed revision is used.
2047 To remove only some changes, without reverting to a prior version, use
2049 merge instead. For example, "merge . --revision -2..-3" will remove
2050 the changes introduced by -2, without affecting the changes introduced
2051 by -1. Or to remove certain changes on a hunk-by-hunk basis, see the
2052 Shelf plugin.
2053 By default, any files that have been manually changed will be backed up
2055 first. (Files changed only by merge are not backed up.) Backup files
2056 have ´.~#~´ appended to their name, where # is a number.
2057 When you provide files, you can use their current pathname or the path‐
2059 name from the target revision. So you can use revert to "undelete" a
2060 file by name. If you name a directory, all the contents of that direc‐
2061 tory will be reverted.
2062 If you have newly added files since the target revision, they will be
2064 removed. If the files to be removed have been changed, backups will be
2065 created as above. Directories containing unknown files will not be
2066 deleted.
2067 The working tree contains a list of revisions that have been merged but
2069 not yet committed. These revisions will be included as additional par‐
2070 ents of the next commit. Normally, using revert clears that list as
2071 well as reverting the files. If any files are specified, revert leaves
2072 the list of uncommitted merges alone and reverts only the files. Use
2073 ``bzr revert and ``bzr revert --forget-merges`` to clear the pending
2074 merge list without reverting any files.
2075 Using "bzr revert --forget-merges", it is possible to apply all of the
2077 changes from a branch in a single revision. To do this, perform the
2078 merge as desired. Then doing revert with the "--forget-merges" option
2079 will keep the content of the tree as it was, but it will clear the list
2080 of pending merges. The next commit will then contain all of the
2081 changes that are present in the other branch, but without any other
2082 parent revisions. Because this technique forgets where these changes
2083 originated, it may cause additional conflicts on later merges involving
2084 the same source and target branches.
2085 bzr revno [LOCATION]
2088 Options:
2089 --help, -h Show help message.
2090 --quiet, -q Only display errors and warnings.
2091 --tree Show revno of working tree
2092 --usage Show usage message and options.
2093 --verbose, -v Display more information.
2094 See also: info
2096 Show current revision number.
2098 This is equal to the number of revisions on this branch.
2100 bzr rm
2103 Alias for "remove", see "bzr remove".
2104 bzr rmbranch
2106 Alias for "remove-branch", see "bzr remove-branch".
2107 bzr root [FILENAME]
2109 Options:
2110 --help, -h Show help message.
2111 --quiet, -q Only display errors and warnings.
2112 --usage Show usage message and options.
2113 --verbose, -v Display more information.
2114 Show the tree root directory.
2116 The root is the nearest enclosing directory with a .bzr control direc‐
2118 tory.
2119 bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
2122 Options:
2123 --body ARG Body for the email.
2124 --format ARG Use the specified output format.
2125 --from ARG, -f Branch to generate the submission from,
2126 rather than the one containing the
2127 working directory.
2128 --help, -h Show help message.
2129 --mail-to ARG Mail the request to this address.
2130 --message ARG, -m Message string.
2131 --no-bundle Do not include a bundle in the merge
2132 directive.
2133 --no-patch Do not include a preview patch in the
2134 merge directive.
2135 --output ARG, -o Write merge directive to this file or
2136 directory; use - for stdout.
2137 --quiet, -q Only display errors and warnings.
2138 --remember Remember submit and public branch.
2139 --revision ARG, -r See "help revisionspec" for details.
2140 --strict Refuse to send if there are uncommitted
2141 changes in the working tree, --no-strict
2142 disables the check.
2143 --usage Show usage message and options.
2144 --verbose, -v Display more information.
2145 See also: merge, pull
2147 Mail or create a merge-directive for submitting changes.
2149 A merge directive provides many things needed for requesting merges:
2151 * A machine-readable description of the merge to perform
2153 * An optional patch that is a preview of the changes requested
2155 * An optional bundle of revision data, so that the changes can be
2157 applied
2158 directly from the merge directive, without retrieving data from a
2159 branch.
2160 `bzr send` creates a compact data set that, when applied using bzr
2162 merge, has the same effect as merging from the source branch.
2163 By default the merge directive is self-contained and can be applied to
2165 any branch containing submit_branch in its ancestory without needing
2166 access to the source branch.
2167 If --no-bundle is specified, then Bazaar doesn´t send the contents of
2169 the revisions, but only a structured request to merge from the pub‐
2170 lic_location. In that case the public_branch is needed and it must be
2171 up-to-date and accessible to the recipient. The public_branch is
2172 always included if known, so that people can check it later.
2173 The submit branch defaults to the parent of the source branch, but can
2175 be overridden. Both submit branch and public branch will be remembered
2176 in branch.conf the first time they are used for a particular branch.
2177 The source branch defaults to that containing the working directory,
2178 but can be changed using --from.
2179 In order to calculate those changes, bzr must analyse the submit
2181 branch. Therefore it is most efficient for the submit branch to be a
2182 local mirror. If a public location is known for the submit_branch,
2183 that location is used in the merge directive.
2184 The default behaviour is to send the merge directive by mail, unless -o
2186 is given, in which case it is sent to a file.
2187 Mail is sent using your preferred mail program. This should be trans‐
2189 parent on Windows (it uses MAPI). On Unix, it requires the xdg-email
2190 utility. If the preferred client can´t be found (or used), your editor
2191 will be used.
2192 To use a specific mail program, set the mail_client configuration
2194 option. (For Thunderbird 1.5, this works around some bugs.) Supported
2195 values for specific clients are "claws", "evolution", "kmail",
2196 "mail.app" (MacOS X´s Mail.app), "mutt", and "thunderbird"; generic
2197 options are "default", "editor", "emacsclient", "mapi", and
2198 "xdg-email". Plugins may also add supported clients.
2199 If mail is being sent, a to address is required. This can be supplied
2201 either on the commandline, by setting the submit_to configuration
2202 option in the branch itself or the child_submit_to configuration option
2203 in the submit branch.
2204 Two formats are currently supported: "4" uses revision bundle format 4
2206 and merge directive format 2. It is significantly faster and smaller
2207 than older formats. It is compatible with Bazaar 0.19 and later. It
2208 is the default. "0.9" uses revision bundle format 0.9 and merge direc‐
2209 tive format 1. It is compatible with Bazaar 0.12 - 0.18.
2210 The merge directives created by bzr send may be applied using bzr merge
2212 or bzr pull by specifying a file containing a merge directive as the
2213 location.
2214 bzr send makes extensive use of public locations to map local locations
2216 into URLs that can be used by other people. See `bzr help configura‐
2217 tion` to set them, and use `bzr info` to display them.
2218 bzr serve
2221 Options:
2222 --allow-writes By default the server is a readonly
2223 server. Supplying --allow-writes
2224 enables write access to the contents of
2225 the served directory and below. Note
2226 that ``bzr serve`` does not perform
2227 authentication, so unless some form of
2228 external authentication is arranged
2229 supplying this option leads to global
2230 uncontrolled write access to your file
2231 system.
2232 --directory ARG, -d Serve contents of this directory.
2233 --help, -h Show help message.
2234 --inet Serve on stdin/out for use from inetd or
2235 sshd.
2236 --port ARG Listen for connections on nominated port
2237 of the form [hostname:]portnumber.
2238 Passing 0 as the port number will result
2239 in a dynamically allocated port. The
2240 default port depends on the protocol.
2241 --protocol ARG Protocol to serve.
2242 --bzr The Bazaar smart server protocol over
2243 TCP. (default port: 4155)
2244 --quiet, -q Only display errors and warnings.
2245 --usage Show usage message and options.
2246 --verbose, -v Display more information.
2247 Alias: server
2249 Run the bzr server.
2251 bzr server
2254 Alias for "serve", see "bzr serve".
2255 bzr shelve [FILE...]
2257 Options:
2258 --all Shelve all changes.
2259 --destroy Destroy removed changes instead of
2260 shelving them.
2261 --directory ARG, -d Branch to operate on, instead of working
2262 directory
2263 --help, -h Show help message.
2264 --list List shelved changes.
2265 --message ARG, -m Message string.
2266 --quiet, -q Only display errors and warnings.
2267 --revision ARG, -r See "help revisionspec" for details.
2268 --usage Show usage message and options.
2269 --verbose, -v Display more information.
2270 --writer ARG Method to use for writing diffs.
2271 --plain Plaintext diff output.
2272 See also: unshelve
2274 Temporarily set aside some changes from the current tree.
2276 Shelve allows you to temporarily put changes you´ve made "on the
2278 shelf", ie. out of the way, until a later time when you can bring them
2279 back from the shelf with the ´unshelve´ command. The changes are
2280 stored alongside your working tree, and so they aren´t propagated along
2281 with your branch nor will they survive its deletion.
2282 If shelve --list is specified, previously-shelved changes are listed.
2284 Shelve is intended to help separate several sets of changes that have
2286 been inappropriately mingled. If you just want to get rid of all
2287 changes and you don´t need to restore them later, use revert. If you
2288 want to shelve all text changes at once, use shelve --all.
2289 If filenames are specified, only the changes to those files will be
2291 shelved. Other files will be left untouched.
2292 If a revision is specified, changes since that revision will be
2294 shelved.
2295 You can put multiple items on the shelf, and by default, ´unshelve´
2297 will restore the most recently shelved changes.
2298 bzr sign-my-commits [LOCATION] [COMMITTER]
2301 Options:
2302 --dry-run Don´t actually sign anything, just print
2303 the revisions that would be signed.
2304 --help, -h Show help message.
2305 --quiet, -q Only display errors and warnings.
2306 --usage Show usage message and options.
2307 --verbose, -v Display more information.
2308 Sign all commits by a given committer.
2310 If location is not specified the local tree is used. If committer is
2312 not specified the default committer is used.
2313 This does not sign commits that already have signatures.
2315 bzr split TREE
2318 Options:
2319 --help, -h Show help message.
2320 --quiet, -q Only display errors and warnings.
2321 --usage Show usage message and options.
2322 --verbose, -v Display more information.
2323 See also: join
2325 Split a subdirectory of a tree into a separate tree.
2327 This command will produce a target tree in a format that supports rich
2329 roots, like ´rich-root´ or ´rich-root-pack´. These formats cannot be
2330 converted into earlier formats like ´dirstate-tags´.
2331 The TREE argument should be a subdirectory of a working tree. That
2333 subdirectory will be converted into an independent tree, with its own
2334 branch. Commits in the top-level tree will not apply to the new sub‐
2335 tree.
2336 bzr st
2339 Alias for "status", see "bzr status".
2340 bzr stat
2342 Alias for "status", see "bzr status".
2343 bzr status [FILE...]
2345 Options:
2346 --change ARG, -c Select changes introduced by the
2347 specified revision. See also "help
2348 revisionspec".
2349 --help, -h Show help message.
2350 --no-pending Don´t show pending merges.
2351 --quiet, -q Only display errors and warnings.
2352 --revision ARG, -r See "help revisionspec" for details.
2353 --short, -S Use short status indicators.
2354 --show-ids Show internal object ids.
2355 --usage Show usage message and options.
2356 --verbose, -v Display more information.
2357 --versioned, -V Only show versioned files.
2358 Aliases: st, stat
2360 See also: diff, revert, status-flags
2362 Display status summary.
2364 This reports on versioned and unknown files, reporting them grouped by
2366 state. Possible states are:
2367 added
2369 Versioned in the working copy but not in the previous revision.
2370 removed
2372 Versioned in the previous revision but removed or deleted
2373 in the working copy.
2374 renamed
2376 Path of this file changed from the previous revision;
2377 the text may also have changed. This includes files whose
2378 parent directory was renamed.
2379 modified
2381 Text has changed since the previous revision.
2382 kind changed
2384 File kind has been changed (e.g. from file to directory).
2385 unknown
2387 Not versioned and not matching an ignore pattern.
2388 Additionally for directories, symlinks and files with an executable
2390 bit, Bazaar indicates their type using a trailing character: ´/´, ´@´
2391 or ´*´ respectively.
2392 To see ignored files use ´bzr ignored´. For details on the changes to
2394 file texts, use ´bzr diff´.
2395 Note that --short or -S gives status flags for each item, similar to
2397 Subversion´s status command. To get output similar to svn -q, use bzr
2398 status -SV.
2399 If no arguments are specified, the status of the entire working direc‐
2401 tory is shown. Otherwise, only the status of the specified files or
2402 directories is reported. If a directory is given, status is reported
2403 for everything inside that directory.
2404 Before merges are committed, the pending merge tip revisions are shown.
2406 To see all pending merge revisions, use the -v option. To skip the
2407 display of pending merge information altogether, use the no-pending
2408 option or specify a file/directory.
2409 If a revision argument is given, the status is calculated against that
2411 revision, or between two revisions if two are provided.
2412 bzr switch [TO_LOCATION]
2415 Options:
2416 --create-branch, -b Create the target branch from this one
2417 before switching to it.
2418 --directory ARG, -d Branch to operate on, instead of working
2419 directory
2420 --force Switch even if local commits will be
2421 lost.
2422 --help, -h Show help message.
2423 --quiet, -q Only display errors and warnings.
2424 --revision ARG, -r See "help revisionspec" for details.
2425 --usage Show usage message and options.
2426 --verbose, -v Display more information.
2427 Set the branch of a checkout and update.
2429 For lightweight checkouts, this changes the branch being referenced.
2431 For heavyweight checkouts, this checks that there are no local commits
2432 versus the current bound branch, then it makes the local branch a mir‐
2433 ror of the new location and binds to it.
2434 In both cases, the working tree is updated and uncommitted changes are
2436 merged. The user can commit or revert these as they desire.
2437 Pending merges need to be committed or reverted before using switch.
2439 The path to the branch to switch to can be specified relative to the
2441 parent directory of the current branch. For example, if you are cur‐
2442 rently in a checkout of /path/to/branch, specifying ´newbranch´ will
2443 find a branch at /path/to/newbranch.
2444 Bound branches use the nickname of its master branch unless it is set
2446 locally, in which case switching will update the local nickname to be
2447 that of the master.
2448 bzr tag [TAG_NAME]
2451 Options:
2452 --delete Delete this tag rather than placing it.
2453 --directory ARG, -d Branch in which to place the tag.
2454 --force Replace existing tags.
2455 --help, -h Show help message.
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, tags
2462 Create, remove or modify a tag naming a revision.
2464 Tags give human-meaningful names to revisions. Commands that take a -r
2466 (--revision) option can be given -rtag:X, where X is any previously
2467 created tag.
2468 Tags are stored in the branch. Tags are copied from one branch to
2470 another along when you branch, push, pull or merge.
2471 It is an error to give a tag name that already exists unless you pass
2473 --force, in which case the tag is moved to point to the new revision.
2474 To rename a tag (change the name but keep it on the same revsion), run
2476 ``bzr tag new-name -r tag:old-name`` and then ``bzr tag --delete old‐
2477 name``.
2478 If no tag name is specified it will be determined through the ´auto‐
2480 matic_tag_name´ hook. This can e.g. be used to automatically tag
2481 upstream releases by reading configure.ac. See ``bzr help hooks`` for
2482 details.
2483 bzr tags
2486 Options:
2487 --directory ARG, -d Branch whose tags should be displayed.
2488 --help, -h Show help message.
2489 --quiet, -q Only display errors and warnings.
2490 --revision ARG, -r See "help revisionspec" for details.
2491 --show-ids Show internal object ids.
2492 --sort ARG Sort tags by different criteria.
2493 "alpha": Sort tags lexicographically
2494 (default). "time": Sort tags
2495 chronologically.
2496 --usage Show usage message and options.
2497 --verbose, -v Display more information.
2498 See also: tag
2500 List tags.
2502 This command shows a table of tag names and the revisions they refer‐
2504 ence.
2505 bzr testament [BRANCH]
2508 Options:
2509 --help, -h Show help message.
2510 --long Produce long-format testament.
2511 --quiet, -q Only display errors and warnings.
2512 --revision ARG, -r See "help revisionspec" for details.
2513 --strict Produce a strict-format testament.
2514 --usage Show usage message and options.
2515 --verbose, -v Display more information.
2516 Show testament (signing-form) of a revision.
2518 bzr unbind
2521 Options:
2522 --directory ARG, -d Branch to operate on, instead of working
2523 directory
2524 --help, -h Show help message.
2525 --quiet, -q Only display errors and warnings.
2526 --usage Show usage message and options.
2527 --verbose, -v Display more information.
2528 See also: bind, checkouts
2530 Convert the current checkout into a regular branch.
2532 After unbinding, the local branch is considered independent and subse‐
2534 quent commits will be local only.
2535 bzr uncommit [LOCATION]
2538 Options:
2539 --dry-run Don´t actually make changes.
2540 --force Say yes to all questions.
2541 --help, -h Show help message.
2542 --local Only remove the commits from the local
2543 branch when in a checkout.
2544 --quiet, -q Only display errors and warnings.
2545 --revision ARG, -r See "help revisionspec" for details.
2546 --usage Show usage message and options.
2547 --verbose, -v Display more information.
2548 See also: commit
2550 Remove the last committed revision.
2552 --verbose will print out what is being removed. --dry-run will go
2554 through all the motions, but not actually remove anything.
2555 If --revision is specified, uncommit revisions to leave the branch at
2557 the specified revision. For example, "bzr uncommit -r 15" will leave
2558 the branch at revision 15.
2559 Uncommit leaves the working tree ready for a new commit. The only
2561 change it may make is to restore any pending merges that were present
2562 before the commit.
2563 bzr unshelve [SHELF_ID]
2566 Options:
2567 --action ARG The action to perform.
2568 --apply Apply changes and remove from the shelf.
2569 --delete-only Delete changes without applying them.
2570 --dry-run Show changes, but do not apply or remove
2571 them.
2572 --keep Apply changes but don´t delete them.
2573 --preview Instead of unshelving the changes, show
2574 the diff that would result from
2575 unshelving.
2576 --directory ARG, -d Branch to operate on, instead of working
2577 directory
2578 --help, -h Show help message.
2579 --quiet, -q Only display errors and warnings.
2580 --usage Show usage message and options.
2581 --verbose, -v Display more information.
2582 See also: shelve
2584 Restore shelved changes.
2586 By default, the most recently shelved changes are restored. However if
2588 you specify a shelf by id those changes will be restored instead. This
2589 works best when the changes don´t depend on each other.
2590 bzr up
2593 Alias for "update", see "bzr update".
2594 bzr update [DIR]
2596 Options:
2597 --help, -h Show help message.
2598 --quiet, -q Only display errors and warnings.
2599 --revision ARG, -r See "help revisionspec" for details.
2600 --usage Show usage message and options.
2601 --verbose, -v Display more information.
2602 Alias: up
2604 See also: pull, status-flags, working-trees
2606 Update a tree to have the latest code committed to its branch.
2608 This will perform a merge into the working tree, and may generate con‐
2610 flicts. If you have any local changes, you will still need to commit
2611 them after the update for the update to be complete.
2612 If you want to discard your local changes, you can just do a ´bzr
2614 revert´ instead of ´bzr commit´ after the update.
2615 If the tree´s branch is bound to a master branch, it will also update
2617 the branch from the master.
2618 bzr upgrade [URL]
2621 Options:
2622 --format ARG Upgrade to a specific format. See "bzr
2623 help formats" for details.
2624 --1.14 A working-tree format that supports
2625 content filtering.
2626 --1.14-rich-root A variant of 1.14 that supports rich-
2627 root data (needed for bzr-svn and bzr-
2628 git).
2629 --2a First format for bzr 2.0 series. Uses
2630 group-compress storage. Provides rich
2631 roots which are a one-way transition.
2632 --default First format for bzr 2.0 series. Uses
2633 group-compress storage. Provides rich
2634 roots which are a one-way transition.
2635 --pack-0.92 New in 0.92: Pack-based format with data
2636 compatible with dirstate-tags format
2637 repositories. Interoperates with bzr
2638 repositories before 0.92 but cannot be
2639 read by bzr < 0.92.
2640 --help, -h Show help message.
2641 --quiet, -q Only display errors and warnings.
2642 --usage Show usage message and options.
2643 --verbose, -v Display more information.
2644 See also: check
2646 Upgrade branch storage to current format.
2648 The check command or bzr developers may sometimes advise you to run
2650 this command. When the default format has changed you may also be
2651 warned during other operations to upgrade.
2652 bzr version
2655 Options:
2656 --help, -h Show help message.
2657 --quiet, -q Only display errors and warnings.
2658 --short Print just the version number.
2659 --usage Show usage message and options.
2660 --verbose, -v Display more information.
2661 Show version of bzr.
2663 bzr version-info [LOCATION]
2666 Options:
2667 --all Include all possible information.
2668 --check-clean Check if tree is clean.
2669 --format ARG Select the output format.
2670 --custom Version info in Custom template-based
2671 format.
2672 --python Version info in Python format.
2673 --rio Version info in RIO (simple text) format
2674 (default).
2675 --help, -h Show help message.
2676 --include-file-revisions Include the last revision for each file.
2677 --include-history Include the revision-history.
2678 --quiet, -q Only display errors and warnings.
2679 --template ARG Template for the output.
2680 --usage Show usage message and options.
2681 --verbose, -v Display more information.
2682 Show version information about this tree.
2684 You can use this command to add information about version into source
2686 code of an application. The output can be in one of the supported for‐
2687 mats or in a custom format based on a template.
2688 For example:
2690 bzr version-info --custom \
2692 --template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n"
2693 will produce a C header file with formatted string containing the cur‐
2695 rent revision number. Other supported variables in templates are:
2696 * {date} - date of the last revision
2698 * {build_date} - current date
2699 * {revno} - revision number
2700 * {revision_id} - revision id
2701 * {branch_nick} - branch nickname
2702 * {clean} - 0 if the source tree contains uncommitted changes,
2703 otherwise 1
2704 bzr view [FILE...]
2707 Options:
2708 --all Apply list or delete action to all
2709 views.
2710 --delete Delete the view.
2711 --help, -h Show help message.
2712 --name ARG Name of the view to define, list or
2713 delete.
2714 --quiet, -q Only display errors and warnings.
2715 --switch ARG Name of the view to switch to.
2716 --usage Show usage message and options.
2717 --verbose, -v Display more information.
2718 Manage filtered views.
2720 Views provide a mask over the tree so that users can focus on a subset
2722 of a tree when doing their work. After creating a view, commands that
2723 support a list of files - status, diff, commit, etc - effectively have
2724 that list of files implicitly given each time. An explicit list of
2725 files can still be given but those files must be within the current
2726 view.
2727 In most cases, a view has a short life-span: it is created to make a
2729 selected change and is deleted once that change is committed. At other
2730 times, you may wish to create one or more named views and switch
2731 between them.
2732 To disable the current view without deleting it, you can switch to the
2734 pseudo view called ``off``. This can be useful when you need to see the
2735 whole tree for an operation or two (e.g. merge) but want to switch back
2736 to your view after that.
2737 Examples:
2739 To define the current view:
2740 bzr view file1 dir1 ...
2742 To list the current view:
2744 bzr view
2746 To delete the current view:
2748 bzr view --delete
2750 To disable the current view without deleting it:
2752 bzr view --switch off
2754 To define a named view and switch to it:
2756 bzr view --name view-name file1 dir1 ...
2758 To list a named view:
2760 bzr view --name view-name
2762 To delete a named view:
2764 bzr view --name view-name --delete
2766 To switch to a named view:
2768 bzr view --switch view-name
2770 To list all views defined:
2772 bzr view --all
2774 To delete all views:
2776 bzr view --delete --all
2778 bzr whoami [NAME]
2781 Options:
2782 --branch Set identity for the current branch
2783 instead of globally.
2784 --directory ARG, -d Branch to operate on, instead of working
2785 directory
2786 --email Display email address only.
2787 --help, -h Show help message.
2788 --quiet, -q Only display errors and warnings.
2789 --usage Show usage message and options.
2790 --verbose, -v Display more information.
2791 Show or set bzr user id.
2793 Examples:
2795 Show the email of the current user:
2796 bzr whoami --email
2798 Set the current user:
2800 bzr whoami "Frank Chu <fchu@example.com>"
2802
2805 BZRPATH
2806 Path where bzr is to look for shell plugin external commands.
2807 BZR_EMAIL
2809 E-Mail address of the user. Overrides default user config.
2810 EMAIL E-Mail address of the user. Overrides default user config.
2812 BZR_EDITOR
2814 Editor for editing commit messages
2815 EDITOR Editor for editing commit messages
2817 BZR_PLUGIN_PATH
2819 Paths where bzr should look for plugins
2820 BZR_HOME
2822 Home directory for bzr
2823
2825 ~/.bazaar/bazaar.conf
2826 Contains the user´s default configuration. The section [DEFAULT]
2827 is used to define general configuration that will be applied
2828 everywhere. The section [ALIASES] can be used to create command
2829 aliases for commonly used options.
2830 A typical config file might look something like:
2832 [DEFAULT]
2834 email=John Doe <jdoe@isp.com>
2835 [ALIASES]
2836 commit = commit --strict
2837 log10 = log --short -r -10..-1
2838
2840 http://bazaar.canonical.com/
28412.2.4 2011-04-28 bzr(1)