1bzr(1) Bazaar bzr(1)
2
3
4
5Man page for Bazaar (bzr)
6
8 Bazaar (bzr) - next-generation distributed version control
9
11 bzr command [ command_options ]
12 bzr help
13 bzr help command
14
16 Bazaar (or bzr) is a project of Canonical to develop an open source
17 distributed version control system that is powerful, friendly, and
18 scalable. Version control means a system that keeps track of previous
19 revisions of software source code or similar information and helps peo‐
20 ple work on it in teams.
21
23 bzr add [FILE...]
24 Add specified files or directories.
25
26 bzr annotate FILENAME
27 Show the origin of each line in a file.
28
29 bzr bind [LOCATION]
30 Convert the current branch into a checkout of the supplied
31 branch.
32
33 bzr branch FROM_LOCATION [TO_LOCATION]
34 Create a new copy of a branch.
35
36 bzr break-lock [LOCATION]
37 Break a dead lock on a repository, branch or working directory.
38
39 bzr cat FILENAME
40 Write the contents of a file as of a given revision to standard
41 output.
42
43 bzr check [BRANCH]
44 Validate consistency of branch history.
45
46 bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
47 Create a new checkout of an existing branch.
48
49 bzr commit [SELECTED...]
50 Commit changes into a new revision.
51
52 bzr conflicts
53 List files with conflicts.
54
55 bzr deleted
56 List files deleted in the working tree.
57
58 bzr diff [FILE...]
59 Show differences in the working tree, between revisions or
60 branches.
61
62 bzr export DEST [BRANCH]
63 Export current or past revision to a destination directory or
64 archive.
65
66 bzr help [TOPIC]
67 Show help on a command or other topic.
68
69 bzr ignore [NAME_PATTERN...]
70 Ignore specified files or patterns.
71
72 bzr ignored
73 List ignored files and the patterns that matched them.
74
75 bzr info [LOCATION]
76 Show information about a working tree, branch or repository.
77
78 bzr init [LOCATION]
79 Make a directory into a versioned branch.
80
81 bzr init-repository LOCATION
82 Create a shared repository to hold branches.
83
84 bzr log [LOCATION]
85 Show log of a branch, file, or directory.
86
87 bzr ls [PATH]
88 List files in a tree.
89
90 bzr merge [BRANCH]
91 Perform a three-way merge.
92
93 bzr missing [OTHER_BRANCH]
94 Show unmerged/unpulled revisions between two branches.
95
96 bzr mkdir DIR...
97 Create a new versioned directory.
98
99 bzr mv [NAMES...]
100 Move or rename a file.
101
102 bzr nick [NICKNAME]
103 Print or set the branch nickname.
104
105 bzr pack [BRANCH_OR_REPO]
106 Compress the data within a repository.
107
108 bzr plugins
109 List the installed plugins.
110
111 bzr pull [LOCATION]
112 Turn this branch into a mirror of another branch.
113
114 bzr push [LOCATION]
115 Update a mirror of this branch.
116
117 bzr reconcile [BRANCH]
118 Reconcile bzr metadata in a branch.
119
120 bzr reconfigure [LOCATION]
121 Reconfigure the type of a bzr directory.
122
123 bzr remerge [FILE...]
124 Redo a merge.
125
126 bzr remove [FILE...]
127 Remove files or directories.
128
129 bzr remove-tree [LOCATION]
130 Remove the working tree from a given branch/checkout.
131
132 bzr renames [DIR]
133 Show list of renamed files.
134
135 bzr resolve [FILE...]
136 Mark a conflict as resolved.
137
138 bzr revert [FILE...]
139 Revert files to a previous revision.
140
141 bzr revno [LOCATION]
142 Show current revision number.
143
144 bzr root [FILENAME]
145 Show the tree root directory.
146
147 bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
148 Mail or create a merge-directive for submiting changes.
149
150 bzr serve
151 Run the bzr server.
152
153 bzr sign-my-commits [LOCATION] [COMMITTER]
154 Sign all commits by a given committer.
155
156 bzr split TREE
157 Split a subdirectory of a tree into a separate tree.
158
159 bzr status [FILE...]
160 Display status summary.
161
162 bzr switch TO_LOCATION
163 Set the branch of a checkout and update.
164
165 bzr tag TAG_NAME
166 Create, remove or modify a tag naming a revision.
167
168 bzr tags
169 List tags.
170
171 bzr testament [BRANCH]
172 Show testament (signing-form) of a revision.
173
174 bzr unbind
175 Convert the current checkout into a regular branch.
176
177 bzr uncommit [LOCATION]
178 Remove the last committed revision.
179
180 bzr update [DIR]
181 Update a tree to have the latest code committed to its branch.
182
183 bzr upgrade [URL]
184 Upgrade branch storage to current format.
185
186 bzr version
187 Show version of bzr.
188
189 bzr version-info [LOCATION]
190 Show version information about this tree.
191
192 bzr whoami [NAME]
193 Show or set bzr user id.
194
196 bzr add [FILE...]
197 Options:
198 --dry-run Show what would be done, but don´t
199 actually do anything.
200 --file-ids-from ARG Lookup file ids from this tree.
201 --help, -h Show help message.
202 --no-recurse Don´t recursively add the contents of
203 directories.
204 --quiet, -q Only display errors and warnings.
205 --verbose, -v Display more information.
206
207 See also: remove
208
209 Add specified files or directories.
210
211 In non-recursive mode, all the named items are added, regardless of
212 whether they were previously ignored. A warning is given if any of the
213 named files are already versioned.
214
215 In recursive mode (the default), files are treated the same way but the
216 behaviour for directories is different. Directories that are already
217 versioned do not give a warning. All directories, whether already ver‐
218 sioned or not, are searched for files or subdirectories that are nei‐
219 ther versioned or ignored, and these are added. This search proceeds
220 recursively into versioned directories. If no names are given ´.´ is
221 assumed.
222
223 Therefore simply saying ´bzr add´ will version all files that are cur‐
224 rently unknown.
225
226 Adding a file whose parent directory is not versioned will implicitly
227 add the parent, and so on up to the root. This means you should never
228 need to explicitly add a directory, they´ll just get added when you add
229 a file in the directory.
230
231 --dry-run will show which files would be added, but not actually add
232 them.
233
234 --file-ids-from will try to use the file ids from the supplied path.
235 It looks up ids trying to find a matching parent directory with the
236 same filename, and then by pure path. This option is rarely needed but
237 can be useful when adding the same logical file into two branches that
238 will be merged later (without showing the two different adds as a con‐
239 flict). It is also useful when merging another project into a subdirec‐
240 tory of this one.
241
242
243 bzr annotate FILENAME
244 Options:
245 --all Show annotations on all lines.
246 --help, -h Show help message.
247 --long Show commit date in annotations.
248 --quiet, -q Only display errors and warnings.
249 --revision ARG, -r See "help revisionspec" for details.
250 --show-ids Show internal object ids.
251 --verbose, -v Display more information.
252
253 Aliases: ann, blame, praise
254
255 Show the origin of each line in a file.
256
257 This prints out the given file with an annotation on the left side
258 indicating which revision, author and date introduced the change.
259
260 If the origin is the same for a run of consecutive lines, it is shown
261 only at the top, unless the --all option is given.
262
263
264 bzr bind [LOCATION]
265 Options:
266 --help, -h Show help message.
267 --quiet, -q Only display errors and warnings.
268 --verbose, -v Display more information.
269
270 See also: checkouts, unbind
271
272 Convert the current branch into a checkout of the supplied branch.
273
274 Once converted into a checkout, commits must succeed on the master
275 branch before they will be applied to the local branch.
276
277
278 bzr branch FROM_LOCATION [TO_LOCATION]
279 Options:
280 --hardlink Hard-link working tree files where
281 possible.
282 --help, -h Show help message.
283 --quiet, -q Only display errors and warnings.
284 --revision ARG, -r See "help revisionspec" for details.
285 --verbose, -v Display more information.
286
287 Aliases: get, clone
288
289 See also: checkout
290
291 Create a new copy of a branch.
292
293 If the TO_LOCATION is omitted, the last component of the FROM_LOCATION
294 will be used. In other words, "branch ../foo/bar" will attempt to cre‐
295 ate ./bar. If the FROM_LOCATION has no / or path separator embedded,
296 the TO_LOCATION is derived from the FROM_LOCATION by stripping a lead‐
297 ing scheme or drive identifier, if any. For example, "branch
298 lp:foo-bar" will attempt to create ./foo-bar.
299
300 To retrieve the branch as of a particular revision, supply the --revi‐
301 sion parameter, as in "branch foo/bar -r 5".
302
303
304 bzr break-lock [LOCATION]
305 Options:
306 --help, -h Show help message.
307 --quiet, -q Only display errors and warnings.
308 --verbose, -v Display more information.
309
310 Break a dead lock on a repository, branch or working directory.
311
312 CAUTION: Locks should only be broken when you are sure that the process
313 holding the lock has been stopped.
314
315 You can get information on what locks are open via the ´bzr info´ com‐
316 mand.
317
318 Examples:
319 bzr break-lock
320
321
322 bzr cat FILENAME
323 Options:
324 --help, -h Show help message.
325 --name-from-revision The path name in the old tree.
326 --quiet, -q Only display errors and warnings.
327 --revision ARG, -r See "help revisionspec" for details.
328 --verbose, -v Display more information.
329
330 See also: ls
331
332 Write the contents of a file as of a given revision to standard output.
333
334 If no revision is nominated, the last revision is used.
335
336 Note: Take care to redirect standard output when using this command on
337 a binary file.
338
339
340 bzr check [BRANCH]
341 Options:
342 --help, -h Show help message.
343 --quiet, -q Only display errors and warnings.
344 --verbose, -v Display more information.
345
346 See also: reconcile
347
348 Validate consistency of branch history.
349
350 This command checks various invariants about the branch storage to
351 detect data corruption or bzr bugs.
352
353 Output fields:
354
355 revisions: This is just the number of revisions checked. It
356 doesn´t
357 indicate a problem.
358 versionedfiles: This is just the number of versionedfiles checked.
359 It
360 doesn´t indicate a problem.
361 unreferenced ancestors: Texts that are ancestors of other texts,
362 but
363 are not properly referenced by the revision ancestry. This is
364 a
365 subtle problem that Bazaar can work around.
366 unique file texts: This is the total number of unique file contents
367 seen in the checked revisions. It does not indicate a problem.
368 repeated file texts: This is the total number of repeated texts
369 seen
370 in the checked revisions. Texts can be repeated when their
371 file
372 entries are modified, but the file contents are not. It does
373 not
374 indicate a problem.
375
376
377 bzr checkout [BRANCH_LOCATION] [TO_LOCATION]
378 Options:
379 --files-from ARG Get file contents from this tree.
380 --hardlink Hard-link working tree files where
381 possible.
382 --help, -h Show help message.
383 --lightweight Perform a lightweight checkout.
384 Lightweight checkouts depend on access
385 to the branch for every operation.
386 Normal checkouts can perform common
387 operations like diff and status without
388 such access, and also support local
389 commits.
390 --quiet, -q Only display errors and warnings.
391 --revision ARG, -r See "help revisionspec" for details.
392 --verbose, -v Display more information.
393
394 Alias: co
395
396 See also: branch, checkouts
397
398 Create a new checkout of an existing branch.
399
400 If BRANCH_LOCATION is omitted, checkout will reconstitute a working
401 tree for the branch found in ´.´. This is useful if you have removed
402 the working tree or if it was never created - i.e. if you pushed the
403 branch to its current location using SFTP.
404
405 If the TO_LOCATION is omitted, the last component of the BRANCH_LOCA‐
406 TION will be used. In other words, "checkout ../foo/bar" will attempt
407 to create ./bar. If the BRANCH_LOCATION has no / or path separator
408 embedded, the TO_LOCATION is derived from the BRANCH_LOCATION by strip‐
409 ping a leading scheme or drive identifier, if any. For example, "check‐
410 out lp:foo-bar" will attempt to create ./foo-bar.
411
412 To retrieve the branch as of a particular revision, supply the --revi‐
413 sion parameter, as in "checkout foo/bar -r 5". Note that this will be
414 immediately out of date [so you cannot commit] but it may be useful
415 (i.e. to examine old code.)
416
417
418 bzr commit [SELECTED...]
419 Options:
420 --author ARG Set the author´s name, if it´s different
421 from the committer.
422 --file MSGFILE, -F Take commit message from this file.
423 --fixes ARG Mark a bug as being fixed by this
424 revision.
425 --help, -h Show help message.
426 --local Perform a local commit in a bound
427 branch. Local commits are not pushed to
428 the master branch until a normal commit
429 is performed.
430 --message ARG, -m Description of the new revision.
431 --quiet, -q Only display errors and warnings.
432 --show-diff When no message is supplied, show the
433 diff along with the status summary in
434 the message editor.
435 --strict Refuse to commit if there are unknown
436 files in the working tree.
437 --unchanged Commit even if nothing has changed.
438 --verbose, -v Display more information.
439
440 Aliases: ci, checkin
441
442 See also: bugs, uncommit
443
444 Commit changes into a new revision.
445
446 If no arguments are given, the entire tree is committed.
447
448 If selected files are specified, only changes to those files are com‐
449 mitted. If a directory is specified then the directory and everything
450 within it is committed.
451
452 If author of the change is not the same person as the committer, you
453 can specify the author´s name using the --author option. The name
454 should be in the same format as a committer-id, e.g. "John Doe
455 <jdoe@example.com>".
456
457 A selected-file commit may fail in some cases where the committed tree
458 would be invalid. Consider:
459
460 bzr init foo
461 mkdir foo/bar
462 bzr add foo/bar
463 bzr commit foo -m "committing foo"
464 bzr mv foo/bar foo/baz
465 mkdir foo/bar
466 bzr add foo/bar
467 bzr commit foo/bar -m "committing bar but not baz"
468
469 In the example above, the last commit will fail by design. This gives
470 the user the opportunity to decide whether they want to commit the
471 rename at the same time, separately first, or not at all. (As a general
472 rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
473
474 Note: A selected-file commit after a merge is not yet supported.
475
476
477 bzr conflicts
478 Options:
479 --help, -h Show help message.
480 --quiet, -q Only display errors and warnings.
481 --text List paths of files with text conflicts.
482 --verbose, -v Display more information.
483
484 List files with conflicts.
485
486 Merge will do its best to combine the changes in two branches, but
487 there are some kinds of problems only a human can fix. When it encoun‐
488 ters those, it will mark a conflict. A conflict means that you need to
489 fix something, before you should commit.
490
491 Conflicts normally are listed as short, human-readable messages. If
492 --text is supplied, the pathnames of files with text conflicts are
493 listed, instead. (This is useful for editing all files with text con‐
494 flicts.)
495
496 Use bzr resolve when you have fixed a problem.
497
498 See also bzr resolve.
499
500
501 bzr deleted
502 Options:
503 --help, -h Show help message.
504 --quiet, -q Only display errors and warnings.
505 --show-ids Show internal object ids.
506 --verbose, -v Display more information.
507
508 See also: ls, status
509
510 List files deleted in the working tree.
511
512
513
514 bzr diff [FILE...]
515 Options:
516 --change ARG, -c Select changes introduced by the
517 specified revision. See also "help
518 revisionspec".
519 --diff-options ARG Pass these options to the external diff
520 program.
521 --help, -h Show help message.
522 --new ARG Branch/tree to compare to.
523 --old ARG Branch/tree to compare from.
524 --prefix ARG, -p Set prefixes added to old and new
525 filenames, as two values separated by a
526 colon. (eg "old/:new/").
527 --quiet, -q Only display errors and warnings.
528 --revision ARG, -r See "help revisionspec" for details.
529 --using ARG Use this command to compare files.
530 --verbose, -v Display more information.
531
532 Aliases: di, dif
533
534 See also: status
535
536 Show differences in the working tree, between revisions or branches.
537
538 If no arguments are given, all changes for the current tree are listed.
539 If files are given, only the changes in those files are listed. Remote
540 and multiple branches can be compared by using the --old and --new
541 options. If not provided, the default for both is derived from the
542 first argument, if any, or the current tree if no arguments are given.
543
544 "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and pro‐
545 duces patches suitable for "patch -p1".
546
547 Exit values:
548 1 - changed
549 2 - unrepresentable changes
550 3 - error
551 0 - no change
552
553 Examples:
554 Shows the difference in the working tree versus the last commit:
555
556 bzr diff
557
558 Difference between the working tree and revision 1:
559
560 bzr diff -r1
561
562 Difference between revision 2 and revision 1:
563
564 bzr diff -r1..2
565
566 Difference between revision 2 and revision 1 for branch xxx:
567
568 bzr diff -r1..2 xxx
569
570 Show just the differences for file NEWS:
571
572 bzr diff NEWS
573
574 Show the differences in working tree xxx for file NEWS:
575
576 bzr diff xxx/NEWS
577
578 Show the differences from branch xxx to this working tree:
579
580 bzr diff --old xxx
581
582 Show the differences between two branches for file NEWS:
583
584 bzr diff --old xxx --new yyy NEWS
585
586 Same as ´bzr diff´ but prefix paths with old/ and new/:
587
588 bzr diff --prefix old/:new/
589
590
591 bzr export DEST [BRANCH]
592 Options:
593 --format ARG Type of file to export to.
594 --help, -h Show help message.
595 --quiet, -q Only display errors and warnings.
596 --revision ARG, -r See "help revisionspec" for details.
597 --root ARG Name of the root directory inside the
598 exported file.
599 --verbose, -v Display more information.
600
601 Export current or past revision to a destination directory or archive.
602
603 If no revision is specified this exports the last committed revision.
604
605 Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
606 given, try to find the format with the extension. If no extension is
607 found exports to a directory (equivalent to --format=dir).
608
609 If root is supplied, it will be used as the root directory inside con‐
610 tainer formats (tar, zip, etc). If it is not supplied it will default
611 to the exported filename. The root option has no effect for ´dir´ for‐
612 mat.
613
614 If branch is omitted then the branch containing the current working
615 directory will be used.
616
617 Note: Export of tree with non-ASCII filenames to zip is not supported.
618
619 ================= =========================
620 Supported formats Autodetected by extension
621 ================= =========================
622 dir (none)
623 tar .tar
624 tbz2 .tar.bz2, .tbz2
625 tgz .tar.gz, .tgz
626 zip .zip
627 ================= =========================
628
629
630 bzr help [TOPIC]
631 Options:
632 --help, -h Show help message.
633 --long Show help on all commands.
634 --quiet, -q Only display errors and warnings.
635 --verbose, -v Display more information.
636
637 Aliases: ?, --help, -?, -h
638
639 See also: topics
640
641 Show help on a command or other topic.
642
643
644
645 bzr ignore [NAME_PATTERN...]
646 Options:
647 --help, -h Show help message.
648 --old-default-rules Write out the ignore rules bzr < 0.9
649 always used.
650 --quiet, -q Only display errors and warnings.
651 --verbose, -v Display more information.
652
653 See also: ignored, status
654
655 Ignore specified files or patterns.
656
657 To remove patterns from the ignore list, edit the .bzrignore file.
658
659 Trailing slashes on patterns are ignored. If the pattern contains a
660 slash or is a regular expression, it is compared to the whole path from
661 the branch root. Otherwise, it is compared to only the last component
662 of the path. To match a file only in the root directory, prepend ´./´.
663
664 Ignore patterns specifying absolute paths are not allowed.
665
666 Ignore patterns may include globbing wildcards such as:
667
668 ? - Matches any single character except ´/´
669 * - Matches 0 or more characters except ´/´
670 /**/ - Matches 0 or more directories in a path
671 [a-z] - Matches a single character from within a group of characters
672
673 Ignore patterns may also be Python regular expressions. Regular
674 expression ignore patterns are identified by a ´RE:´ prefix followed by
675 the regular expression. Regular expression ignore patterns may not
676 include named or numbered groups.
677
678 Note: ignore patterns containing shell wildcards must be quoted from
679 the shell on Unix.
680
681 Examples:
682 Ignore the top level Makefile:
683
684 bzr ignore ./Makefile
685
686 Ignore class files in all directories:
687
688 bzr ignore "*.class"
689
690 Ignore .o files under the lib directory:
691
692 bzr ignore "lib/**/*.o"
693
694 Ignore .o files under the lib directory:
695
696 bzr ignore "RE:lib/.*\.o"
697
698 Ignore everything but the "debian" toplevel directory:
699
700 bzr ignore "RE:(?!debian/).*"
701
702
703 bzr ignored
704 Options:
705 --help, -h Show help message.
706 --quiet, -q Only display errors and warnings.
707 --verbose, -v Display more information.
708
709 See also: ignore
710
711 List ignored files and the patterns that matched them.
712
713
714
715 bzr info [LOCATION]
716 Options:
717 --help, -h Show help message.
718 --quiet, -q Only display errors and warnings.
719 --verbose, -v Display more information.
720
721 See also: repositories, revno, working-trees
722
723 Show information about a working tree, branch or repository.
724
725 This command will show all known locations and formats associated to
726 the tree, branch or repository. Statistical information is included
727 with each report.
728
729 Branches and working trees will also report any missing revisions.
730
731
732 bzr init [LOCATION]
733 Options:
734 --append-revisions-only Never change revnos or the existing log.
735 Append revisions to it only.
736 --create-prefix Create the path leading up to the branch
737 if it does not already exist.
738 --format ARG Specify a format for this branch. See
739 "help formats".
740 --default New in 0.92: Pack-based format with data
741 compatible with dirstate-tags format
742 repositories. Interoperates with bzr
743 repositories before 0.92 but cannot be
744 read by bzr < 0.92. Previously called
745 knitpack-experimental. For more
746 information, see http://doc.bazaar-
747 vcs.org/latest/developers/packrepo.html.
748 --development Current development format. Can convert
749 data to and from pack-0.92 (and anything
750 compatible with pack-0.92) format
751 repositories. Repositories in this
752 format can only be read by bzr.dev.
753 Please read http://doc.bazaar-
754 vcs.org/latest/developers/development-
755 repo.html before use.
756 --development-subtree Current development format, subtree
757 variant. Can convert data to and from
758 pack-0.92 (and anything compatible with
759 pack-0.92) format repositories.
760 Repositories in this format can only be
761 read by bzr.dev. Please read http://doc
762 .bazaar-vcs.org/latest/developers
763 /development-repo.html before use.
764 --dirstate New in 0.15: Fast local operations.
765 Compatible with bzr 0.8 and above when
766 accessed over the network.
767 --dirstate-tags New in 0.15: Fast local operations and
768 improved scaling for network operations.
769 Additionally adds support for tags.
770 Incompatible with bzr < 0.15.
771 --knit Format using knits. Recommended for
772 interoperation with bzr <= 0.14.
773 --metaweave Transitional format in 0.8. Slower than
774 knit.
775 --pack-0.92 New in 0.92: Pack-based format with data
776 compatible with dirstate-tags format
777 repositories. Interoperates with bzr
778 repositories before 0.92 but cannot be
779 read by bzr < 0.92. Previously called
780 knitpack-experimental. For more
781 information, see http://doc.bazaar-
782 vcs.org/latest/developers/packrepo.html.
783 --rich-root New in 1.0. Better handling of tree
784 roots. Incompatible with bzr < 1.0
785 --rich-root-pack New in 1.0: Pack-based format with data
786 compatible with rich-root format
787 repositories. Incompatible with bzr <
788 1.0
789 --weave Pre-0.8 format. Slower than knit and
790 does not support checkouts or shared
791 repositories.
792 --help, -h Show help message.
793 --quiet, -q Only display errors and warnings.
794 --verbose, -v Display more information.
795
796 See also: branch, checkout, init-repository
797
798 Make a directory into a versioned branch.
799
800 Use this to create an empty branch, or before importing an existing
801 project.
802
803 If there is a repository in a parent directory of the location, then
804 the history of the branch will be stored in the repository. Otherwise
805 init creates a standalone branch which carries its own history in the
806 .bzr directory.
807
808 If there is already a branch at the location but it has no working
809 tree, the tree can be populated with ´bzr checkout´.
810
811 Recipe for importing a tree of files:
812
813 cd ~/project
814 bzr init
815 bzr add .
816 bzr status
817 bzr commit -m "imported project"
818
819
820 bzr init-repository LOCATION
821 Options:
822 --format ARG Specify a format for this repository.
823 See "bzr help formats" for details.
824 --default New in 0.92: Pack-based format with data
825 compatible with dirstate-tags format
826 repositories. Interoperates with bzr
827 repositories before 0.92 but cannot be
828 read by bzr < 0.92. Previously called
829 knitpack-experimental. For more
830 information, see http://doc.bazaar-
831 vcs.org/latest/developers/packrepo.html.
832 --development Current development format. Can convert
833 data to and from pack-0.92 (and anything
834 compatible with pack-0.92) format
835 repositories. Repositories in this
836 format can only be read by bzr.dev.
837 Please read http://doc.bazaar-
838 vcs.org/latest/developers/development-
839 repo.html before use.
840 --development-subtree Current development format, subtree
841 variant. Can convert data to and from
842 pack-0.92 (and anything compatible with
843 pack-0.92) format repositories.
844 Repositories in this format can only be
845 read by bzr.dev. Please read http://doc
846 .bazaar-vcs.org/latest/developers
847 /development-repo.html before use.
848 --dirstate New in 0.15: Fast local operations.
849 Compatible with bzr 0.8 and above when
850 accessed over the network.
851 --dirstate-tags New in 0.15: Fast local operations and
852 improved scaling for network operations.
853 Additionally adds support for tags.
854 Incompatible with bzr < 0.15.
855 --knit Format using knits. Recommended for
856 interoperation with bzr <= 0.14.
857 --metaweave Transitional format in 0.8. Slower than
858 knit.
859 --pack-0.92 New in 0.92: Pack-based format with data
860 compatible with dirstate-tags format
861 repositories. Interoperates with bzr
862 repositories before 0.92 but cannot be
863 read by bzr < 0.92. Previously called
864 knitpack-experimental. For more
865 information, see http://doc.bazaar-
866 vcs.org/latest/developers/packrepo.html.
867 --rich-root New in 1.0. Better handling of tree
868 roots. Incompatible with bzr < 1.0
869 --rich-root-pack New in 1.0: Pack-based format with data
870 compatible with rich-root format
871 repositories. Incompatible with bzr <
872 1.0
873 --weave Pre-0.8 format. Slower than knit and
874 does not support checkouts or shared
875 repositories.
876 --help, -h Show help message.
877 --no-trees Branches in the repository will default
878 to not having a working tree.
879 --quiet, -q Only display errors and warnings.
880 --verbose, -v Display more information.
881
882 Alias: init-repo
883
884 See also: branch, checkout, init, repositories
885
886 Create a shared repository to hold branches.
887
888 New branches created under the repository directory will store their
889 revisions in the repository, not in the branch directory.
890
891 If the --no-trees option is used then the branches in the repository
892 will not have working trees by default.
893
894 Examples:
895 Create a shared repositories holding just branches:
896
897 bzr init-repo --no-trees repo
898 bzr init repo/trunk
899
900 Make a lightweight checkout elsewhere:
901
902 bzr checkout --lightweight repo/trunk trunk-checkout
903 cd trunk-checkout
904 (add files here)
905
906
907 bzr log [LOCATION]
908 Options:
909 --forward Show from oldest to newest.
910 --help, -h Show help message.
911 --limit N, -l Limit the output to the first N
912 revisions.
913 --log-format ARG Use specified log format.
914 --line Log format with one line per revision
915 --long Detailed log format
916 --short Moderately short log format
917 --message ARG, -m Show revisions whose message matches
918 this regular expression.
919 --quiet, -q Only display errors and warnings.
920 --revision ARG, -r See "help revisionspec" for details.
921 --show-ids Show internal object ids.
922 --timezone ARG Display timezone as local, original, or
923 utc.
924 --verbose, -v Show files changed in each revision.
925
926 Show log of a branch, file, or directory.
927
928 By default show the log of the branch containing the working directory.
929
930 To request a range of logs, you can use the command -r begin..end -r
931 revision requests a specific revision, -r ..end or -r begin.. are also
932 valid.
933
934 Examples:
935 Log the current branch:
936
937 bzr log
938
939 Log a file:
940
941 bzr log foo.c
942
943 Log the last 10 revisions of a branch:
944
945 bzr log -r -10.. http://server/branch
946
947
948 bzr ls [PATH]
949 Options:
950 --from-root Print paths relative to the root of the
951 branch.
952 --help, -h Show help message.
953 --ignored Print ignored files.
954 --kind ARG List entries of a particular kind: file,
955 directory, symlink.
956 --non-recursive Don´t recurse into subdirectories.
957 --null Write an ascii NUL (\0) separator
958 between files rather than a newline.
959 --quiet, -q Only display errors and warnings.
960 --revision ARG, -r See "help revisionspec" for details.
961 --show-ids Show internal object ids.
962 --unknown Print unknown files.
963 --verbose, -v Display more information.
964 --versioned Print versioned files.
965
966 See also: cat, status
967
968 List files in a tree.
969
970
971
972 bzr merge [BRANCH]
973 Options:
974 --change ARG, -c Select changes introduced by the
975 specified revision. See also "help
976 revisionspec".
977 --directory ARG, -d Branch to merge into, rather than the
978 one containing the working directory.
979 --force Merge even if the destination tree has
980 uncommitted changes.
981 --help, -h Show help message.
982 --merge-type ARG Select a particular merge algorithm.
983 --diff3 Merge using external diff3
984 --lca LCA-newness merge
985 --merge3 Native diff3-style merge
986 --weave Weave-based merge
987 --preview Instead of merging, show a diff of the
988 merge.
989 --pull If the destination is already completely
990 merged into the source, pull from the
991 source rather than merging. When this
992 happens, you do not need to commit the
993 result.
994 --quiet, -q Only display errors and warnings.
995 --remember Remember the specified location as a
996 default.
997 --reprocess Reprocess to reduce spurious conflicts.
998 --revision ARG, -r See "help revisionspec" for details.
999 --show-base Show base revision text in conflicts.
1000 --uncommitted Apply uncommitted changes from a working
1001 copy, instead of branch changes.
1002 --verbose, -v Display more information.
1003
1004 See also: remerge, status-flags, update
1005
1006 Perform a three-way merge.
1007
1008 The branch is the branch you will merge from. By default, it will
1009 merge the latest revision. If you specify a revision, that revision
1010 will be merged. If you specify two revisions, the first will be used
1011 as a BASE, and the second one as OTHER. Revision numbers are always
1012 relative to the specified branch.
1013
1014 By default, bzr will try to merge in all new work from the other
1015 branch, automatically determining an appropriate base. If this fails,
1016 you may need to give an explicit base.
1017
1018 Merge will do its best to combine the changes in two branches, but
1019 there are some kinds of problems only a human can fix. When it encoun‐
1020 ters those, it will mark a conflict. A conflict means that you need to
1021 fix something, before you should commit.
1022
1023 Use bzr resolve when you have fixed a problem. See also bzr conflicts.
1024
1025 If there is no default branch set, the first merge will set it. After
1026 that, you can omit the branch to use the default. To change the
1027 default, use --remember. The value will only be saved if the remote
1028 location can be accessed.
1029
1030 The results of the merge are placed into the destination working direc‐
1031 tory, where they can be reviewed (with bzr diff), tested, and then com‐
1032 mitted to record the result of the merge.
1033
1034 merge refuses to run if there are any uncommitted changes, unless
1035 --force is given.
1036
1037 Examples:
1038 To merge the latest revision from bzr.dev:
1039
1040 bzr merge ../bzr.dev
1041
1042 To merge changes up to and including revision 82 from bzr.dev:
1043
1044 bzr merge -r 82 ../bzr.dev
1045
1046 To merge the changes introduced by 82, without previous changes:
1047
1048 bzr merge -r 81..82 ../bzr.dev
1049
1050
1051 bzr missing [OTHER_BRANCH]
1052 Options:
1053 --help, -h Show help message.
1054 --log-format ARG Use specified log format.
1055 --line Log format with one line per revision
1056 --long Detailed log format
1057 --short Moderately short log format
1058 --mine-only Display changes in the local branch
1059 only.
1060 --other Same as --theirs-only.
1061 --quiet, -q Only display errors and warnings.
1062 --reverse Reverse the order of revisions.
1063 --show-ids Show internal object ids.
1064 --theirs-only Display changes in the remote branch
1065 only.
1066 --this Same as --mine-only.
1067 --verbose, -v Display more information.
1068
1069 See also: merge, pull
1070
1071 Show unmerged/unpulled revisions between two branches.
1072
1073 OTHER_BRANCH may be local or remote.
1074
1075
1076 bzr mkdir DIR...
1077 Options:
1078 --help, -h Show help message.
1079 --quiet, -q Only display errors and warnings.
1080 --verbose, -v Display more information.
1081
1082 Create a new versioned directory.
1083
1084 This is equivalent to creating the directory and then adding it.
1085
1086
1087 bzr mv [NAMES...]
1088 Options:
1089 --after Move only the bzr identifier of the
1090 file, because the file has already been
1091 moved.
1092 --help, -h Show help message.
1093 --quiet, -q Only display errors and warnings.
1094 --verbose, -v Display more information.
1095
1096 Aliases: move, rename
1097
1098 Move or rename a file.
1099
1100 Usage:
1101 bzr mv OLDNAME NEWNAME
1102
1103 bzr mv SOURCE... DESTINATION
1104
1105 If the last argument is a versioned directory, all the other names are
1106 moved into it. Otherwise, there must be exactly two arguments and the
1107 file is changed to a new name.
1108
1109 If OLDNAME does not exist on the filesystem but is versioned and NEW‐
1110 NAME does exist on the filesystem but is not versioned, mv assumes that
1111 the file has been manually moved and only updates its internal inven‐
1112 tory to reflect that change. The same is valid when moving many SOURCE
1113 files to a DESTINATION.
1114
1115 Files cannot be moved between branches.
1116
1117
1118 bzr nick [NICKNAME]
1119 Options:
1120 --help, -h Show help message.
1121 --quiet, -q Only display errors and warnings.
1122 --verbose, -v Display more information.
1123
1124 See also: info
1125
1126 Print or set the branch nickname.
1127
1128 If unset, the tree root directory name is used as the nickname To print
1129 the current nickname, execute with no argument.
1130
1131
1132 bzr pack [BRANCH_OR_REPO]
1133 Options:
1134 --help, -h Show help message.
1135 --quiet, -q Only display errors and warnings.
1136 --verbose, -v Display more information.
1137
1138 See also: repositories
1139
1140 Compress the data within a repository.
1141
1142
1143 bzr plugins
1144 Options:
1145 --help, -h Show help message.
1146 --quiet, -q Only display errors and warnings.
1147 --verbose, -v Display more information.
1148
1149 List the installed plugins.
1150
1151 This command displays the list of installed plugins including version
1152 of plugin and a short description of each.
1153
1154 --verbose shows the path where each plugin is located.
1155
1156 A plugin is an external component for Bazaar that extends the revision
1157 control system, by adding or replacing code in Bazaar. Plugins can do
1158 a variety of things, including overriding commands, adding new com‐
1159 mands, providing additional network transports and customizing log out‐
1160 put.
1161
1162 See the Bazaar web site, http://bazaar-vcs.org, for further information
1163 on plugins including where to find them and how to install them.
1164 Instructions are also provided there on how to write new plugins using
1165 the Python programming language.
1166
1167
1168 bzr pull [LOCATION]
1169 Options:
1170 --directory ARG, -d Branch to pull into, rather than the one
1171 containing the working directory.
1172 --help, -h Show help message.
1173 --overwrite Ignore differences between branches and
1174 overwrite unconditionally.
1175 --quiet, -q Only display errors and warnings.
1176 --remember Remember the specified location as a
1177 default.
1178 --revision ARG, -r See "help revisionspec" for details.
1179 --verbose, -v Show logs of pulled revisions.
1180
1181 See also: push, status-flags, update
1182
1183 Turn this branch into a mirror of another branch.
1184
1185 This command only works on branches that have not diverged. Branches
1186 are considered diverged if the destination branch´s most recent commit
1187 is one that has not been merged (directly or indirectly) into the par‐
1188 ent.
1189
1190 If branches have diverged, you can use ´bzr merge´ to integrate the
1191 changes from one into the other. Once one branch has merged, the other
1192 should be able to pull it again.
1193
1194 If you want to forget your local changes and just update your branch to
1195 match the remote one, use pull --overwrite.
1196
1197 If there is no default location set, the first pull will set it. After
1198 that, you can omit the location to use the default. To change the
1199 default, use --remember. The value will only be saved if the remote
1200 location can be accessed.
1201
1202
1203 bzr push [LOCATION]
1204 Options:
1205 --create-prefix Create the path leading up to the branch
1206 if it does not already exist.
1207 --directory ARG, -d Branch to push from, rather than the one
1208 containing the working directory.
1209 --help, -h Show help message.
1210 --overwrite Ignore differences between branches and
1211 overwrite unconditionally.
1212 --quiet, -q Only display errors and warnings.
1213 --remember Remember the specified location as a
1214 default.
1215 --revision ARG, -r See "help revisionspec" for details.
1216 --use-existing-dir By default push will fail if the target
1217 directory exists, but does not already
1218 have a control directory. This flag
1219 will allow push to proceed.
1220 --verbose, -v Display more information.
1221
1222 See also: pull, update, working-trees
1223
1224 Update a mirror of this branch.
1225
1226 The target branch will not have its working tree populated because this
1227 is both expensive, and is not supported on remote file systems.
1228
1229 Some smart servers or protocols *may* put the working tree in place in
1230 the future.
1231
1232 This command only works on branches that have not diverged. Branches
1233 are considered diverged if the destination branch´s most recent commit
1234 is one that has not been merged (directly or indirectly) by the source
1235 branch.
1236
1237 If branches have diverged, you can use ´bzr push --overwrite´ to
1238 replace the other branch completely, discarding its unmerged changes.
1239
1240 If you want to ensure you have the different changes in the other
1241 branch, do a merge (see bzr help merge) from the other branch, and com‐
1242 mit that. After that you will be able to do a push without ´--over‐
1243 write´.
1244
1245 If there is no default push location set, the first push will set it.
1246 After that, you can omit the location to use the default. To change
1247 the default, use --remember. The value will only be saved if the remote
1248 location can be accessed.
1249
1250
1251 bzr reconcile [BRANCH]
1252 Options:
1253 --help, -h Show help message.
1254 --quiet, -q Only display errors and warnings.
1255 --verbose, -v Display more information.
1256
1257 See also: check
1258
1259 Reconcile bzr metadata in a branch.
1260
1261 This can correct data mismatches that may have been caused by previous
1262 ghost operations or bzr upgrades. You should only need to run this com‐
1263 mand if ´bzr check´ or a bzr developer advises you to run it.
1264
1265 If a second branch is provided, cross-branch reconciliation is also
1266 attempted, which will check that data like the tree root id which was
1267 not present in very early bzr versions is represented correctly in both
1268 branches.
1269
1270 At the same time it is run it may recompress data resulting in a poten‐
1271 tial saving in disk space or performance gain.
1272
1273 The branch *MUST* be on a listable system such as local disk or sftp.
1274
1275
1276 bzr reconfigure [LOCATION]
1277 Options:
1278 --bind-to ARG Branch to bind checkout to.
1279 --force Perform reconfiguration even if local
1280 changes will be lost.
1281 --help, -h Show help message.
1282 --quiet, -q Only display errors and warnings.
1283 --target_type ARG The type to reconfigure the directory
1284 to.
1285 --branch Reconfigure to a branch.
1286 --checkout Reconfigure to a checkout.
1287 --lightweight-checkout Reconfigure to a lightweight checkout.
1288 --tree Reconfigure to a tree.
1289 --verbose, -v Display more information.
1290
1291 Reconfigure the type of a bzr directory.
1292
1293 A target configuration must be specified.
1294
1295 For checkouts, the bind-to location will be auto-detected if not speci‐
1296 fied. The order of preference is 1. For a lightweight checkout, the
1297 current bound location. 2. For branches that used to be checkouts, the
1298 previously-bound location. 3. The push location. 4. The parent loca‐
1299 tion. If none of these is available, --bind-to must be specified.
1300
1301
1302 bzr remerge [FILE...]
1303 Options:
1304 --help, -h Show help message.
1305 --merge-type ARG Select a particular merge algorithm.
1306 --diff3 Merge using external diff3
1307 --lca LCA-newness merge
1308 --merge3 Native diff3-style merge
1309 --weave Weave-based merge
1310 --quiet, -q Only display errors and warnings.
1311 --reprocess Reprocess to reduce spurious conflicts.
1312 --show-base Show base revision text in conflicts.
1313 --verbose, -v Display more information.
1314
1315 Redo a merge.
1316
1317 Use this if you want to try a different merge technique while resolving
1318 conflicts. Some merge techniques are better than others, and remerge
1319 lets you try different ones on different files.
1320
1321 The options for remerge have the same meaning and defaults as the ones
1322 for merge. The difference is that remerge can (only) be run when there
1323 is a pending merge, and it lets you specify particular files.
1324
1325 Examples:
1326 Re-do the merge of all conflicted files, and show the base text in
1327 conflict regions, in addition to the usual THIS and OTHER texts:
1328
1329 bzr remerge --show-base
1330
1331 Re-do the merge of "foobar", using the weave merge algorithm, with
1332 additional processing to reduce the size of conflict regions:
1333
1334 bzr remerge --merge-type weave --reprocess foobar
1335
1336
1337 bzr remove [FILE...]
1338 Options:
1339 --file-deletion-strategy ARGThe file deletion mode to be used.
1340 --force Delete all the specified files, even if
1341 they can not be recovered and even if
1342 they are non-empty directories.
1343 --keep Don´t delete any files.
1344 --safe Only delete files if they can be safely
1345 recovered (default).
1346 --help, -h Show help message.
1347 --new Remove newly-added files.
1348 --quiet, -q Only display errors and warnings.
1349 --verbose, -v Display more information.
1350
1351 Alias: rm
1352
1353 Remove files or directories.
1354
1355 This makes bzr stop tracking changes to the specified files and delete
1356 them if they can easily be recovered using revert.
1357
1358 You can specify one or more files, and/or --new. If you specify --new,
1359 only ´added´ files will be removed. If you specify both, then new
1360 files in the specified directories will be removed. If the directories
1361 are also new, they will also be removed.
1362
1363
1364 bzr remove-tree [LOCATION]
1365 Options:
1366 --help, -h Show help message.
1367 --quiet, -q Only display errors and warnings.
1368 --verbose, -v Display more information.
1369
1370 See also: checkout, working-trees
1371
1372 Remove the working tree from a given branch/checkout.
1373
1374 Since a lightweight checkout is little more than a working tree this
1375 will refuse to run against one.
1376
1377 To re-create the working tree, use "bzr checkout".
1378
1379
1380 bzr renames [DIR]
1381 Options:
1382 --help, -h Show help message.
1383 --quiet, -q Only display errors and warnings.
1384 --verbose, -v Display more information.
1385
1386 See also: status
1387
1388 Show list of renamed files.
1389
1390
1391
1392 bzr resolve [FILE...]
1393 Options:
1394 --all Resolve all conflicts in this tree.
1395 --help, -h Show help message.
1396 --quiet, -q Only display errors and warnings.
1397 --verbose, -v Display more information.
1398
1399 Alias: resolved
1400
1401 Mark a conflict as resolved.
1402
1403 Merge will do its best to combine the changes in two branches, but
1404 there are some kinds of problems only a human can fix. When it encoun‐
1405 ters those, it will mark a conflict. A conflict means that you need to
1406 fix something, before you should commit.
1407
1408 Once you have fixed a problem, use "bzr resolve" to automatically mark
1409 text conflicts as fixed, resolve FILE to mark a specific conflict as
1410 resolved, or "bzr resolve --all" to mark all conflicts as resolved.
1411
1412 See also bzr conflicts.
1413
1414
1415 bzr revert [FILE...]
1416 Options:
1417 --forget-merges Remove pending merge marker, without
1418 changing any files.
1419 --help, -h Show help message.
1420 --no-backup Do not save backups of reverted files.
1421 --quiet, -q Only display errors and warnings.
1422 --revision ARG, -r See "help revisionspec" for details.
1423 --verbose, -v Display more information.
1424
1425 See also: cat, export
1426
1427 Revert files to a previous revision.
1428
1429 Giving a list of files will revert only those files. Otherwise, all
1430 files will be reverted. If the revision is not specified with ´--revi‐
1431 sion´, the last committed revision is used.
1432
1433 To remove only some changes, without reverting to a prior version, use
1434 merge instead. For example, "merge . --revision -2..-3" will remove
1435 the changes introduced by -2, without affecting the changes introduced
1436 by -1. Or to remove certain changes on a hunk-by-hunk basis, see the
1437 Shelf plugin.
1438
1439 By default, any files that have been manually changed will be backed up
1440 first. (Files changed only by merge are not backed up.) Backup files
1441 have ´.~#~´ appended to their name, where # is a number.
1442
1443 When you provide files, you can use their current pathname or the path‐
1444 name from the target revision. So you can use revert to "undelete" a
1445 file by name. If you name a directory, all the contents of that direc‐
1446 tory will be reverted.
1447
1448 Any files that have been newly added since that revision will be
1449 deleted, with a backup kept if appropriate. Directories containing
1450 unknown files will not be deleted.
1451
1452 The working tree contains a list of pending merged revisions, which
1453 will be included as parents in the next commit. Normally, revert
1454 clears that list as well as reverting the files. If any files are
1455 specified, revert leaves the pending merge list alone and reverts only
1456 the files. Use "bzr revert ." in the tree root to revert all files but
1457 keep the merge record, and "bzr revert --forget-merges" to clear the
1458 pending merge list without reverting any files.
1459
1460
1461 bzr revno [LOCATION]
1462 Options:
1463 --help, -h Show help message.
1464 --quiet, -q Only display errors and warnings.
1465 --verbose, -v Display more information.
1466
1467 See also: info
1468
1469 Show current revision number.
1470
1471 This is equal to the number of revisions on this branch.
1472
1473
1474 bzr root [FILENAME]
1475 Options:
1476 --help, -h Show help message.
1477 --quiet, -q Only display errors and warnings.
1478 --verbose, -v Display more information.
1479
1480 Show the tree root directory.
1481
1482 The root is the nearest enclosing directory with a .bzr control direc‐
1483 tory.
1484
1485
1486 bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
1487 Options:
1488 --format ARG Use the specified output format.
1489 --from ARG, -f Branch to generate the submission from,
1490 rather than the one containing the
1491 working directory.
1492 --help, -h Show help message.
1493 --mail-to ARG Mail the request to this address.
1494 --message ARG, -m Message string.
1495 --no-bundle Do not include a bundle in the merge
1496 directive.
1497 --no-patch Do not include a preview patch in the
1498 merge directive.
1499 --output ARG, -o Write directive to this file.
1500 --quiet, -q Only display errors and warnings.
1501 --remember Remember submit and public branch.
1502 --revision ARG, -r See "help revisionspec" for details.
1503 --verbose, -v Display more information.
1504
1505 See also: merge
1506
1507 Mail or create a merge-directive for submiting changes.
1508
1509 A merge directive provides many things needed for requesting merges:
1510
1511 * A machine-readable description of the merge to perform
1512
1513 * An optional patch that is a preview of the changes requested
1514
1515 * An optional bundle of revision data, so that the changes can be
1516 applied
1517 directly from the merge directive, without retrieving data from a
1518 branch.
1519
1520 If --no-bundle is specified, then public_branch is needed (and must be
1521 up-to-date), so that the receiver can perform the merge using the pub‐
1522 lic_branch. The public_branch is always included if known, so that
1523 people can check it later.
1524
1525 The submit branch defaults to the parent, but can be overridden. Both
1526 submit branch and public branch will be remembered if supplied.
1527
1528 If a public_branch is known for the submit_branch, that public submit
1529 branch is used in the merge instructions. This means that a local mir‐
1530 ror can be used as your actual submit branch, once you have set pub‐
1531 lic_branch for that mirror.
1532
1533 Mail is sent using your preferred mail program. This should be trans‐
1534 parent on Windows (it uses MAPI). On Linux, it requires the xdg-email
1535 utility. If the preferred client can´t be found (or used), your editor
1536 will be used.
1537
1538 To use a specific mail program, set the mail_client configuration
1539 option. (For Thunderbird 1.5, this works around some bugs.) Supported
1540 values for specific clients are "evolution", "kmail", "mutt", and
1541 "thunderbird"; generic options are "default", "editor", "mapi", and
1542 "xdg-email".
1543
1544 If mail is being sent, a to address is required. This can be supplied
1545 either on the commandline, by setting the submit_to configuration
1546 option in the branch itself or the child_submit_to configuration option
1547 in the submit branch.
1548
1549 Two formats are currently supported: "4" uses revision bundle format 4
1550 and merge directive format 2. It is significantly faster and smaller
1551 than older formats. It is compatible with Bazaar 0.19 and later. It
1552 is the default. "0.9" uses revision bundle format 0.9 and merge direc‐
1553 tive format 1. It is compatible with Bazaar 0.12 - 0.18.
1554
1555
1556 bzr serve
1557 Options:
1558 --allow-writes By default the server is a readonly
1559 server. Supplying --allow-writes
1560 enables write access to the contents of
1561 the served directory and below.
1562 --directory ARG Serve contents of this directory.
1563 --help, -h Show help message.
1564 --inet Serve on stdin/out for use from inetd or
1565 sshd.
1566 --port ARG Listen for connections on nominated port
1567 of the form [hostname:]portnumber.
1568 Passing 0 as the port number will result
1569 in a dynamically allocated port. The
1570 default port is 4155.
1571 --quiet, -q Only display errors and warnings.
1572 --verbose, -v Display more information.
1573
1574 Alias: server
1575
1576 Run the bzr server.
1577
1578
1579 bzr sign-my-commits [LOCATION] [COMMITTER]
1580 Options:
1581 --dry-run Don´t actually sign anything, just print
1582 the revisions that would be signed.
1583 --help, -h Show help message.
1584 --quiet, -q Only display errors and warnings.
1585 --verbose, -v Display more information.
1586
1587 Sign all commits by a given committer.
1588
1589 If location is not specified the local tree is used. If committer is
1590 not specified the default committer is used.
1591
1592 This does not sign commits that already have signatures.
1593
1594
1595 bzr split TREE
1596 Options:
1597 --help, -h Show help message.
1598 --quiet, -q Only display errors and warnings.
1599 --verbose, -v Display more information.
1600
1601 Split a subdirectory of a tree into a separate tree.
1602
1603 This command will produce a target tree in a format that supports rich
1604 roots, like ´rich-root´ or ´rich-root-pack´. These formats cannot be
1605 converted into earlier formats like ´dirstate-tags´.
1606
1607 The TREE argument should be a subdirectory of a working tree. That
1608 subdirectory will be converted into an independent tree, with its own
1609 branch. Commits in the top-level tree will not apply to the new sub‐
1610 tree.
1611
1612
1613 bzr status [FILE...]
1614 Options:
1615 --change ARG, -c Select changes introduced by the
1616 specified revision. See also "help
1617 revisionspec".
1618 --help, -h Show help message.
1619 --quiet, -q Only display errors and warnings.
1620 --revision ARG, -r See "help revisionspec" for details.
1621 --short, -S Use short status indicators.
1622 --show-ids Show internal object ids.
1623 --verbose, -v Display more information.
1624 --versioned, -V Only show versioned files.
1625
1626 Aliases: st, stat
1627
1628 See also: diff, revert, status-flags
1629
1630 Display status summary.
1631
1632 This reports on versioned and unknown files, reporting them grouped by
1633 state. Possible states are:
1634
1635 added
1636 Versioned in the working copy but not in the previous revision.
1637
1638 removed
1639 Versioned in the previous revision but removed or deleted
1640 in the working copy.
1641
1642 renamed
1643 Path of this file changed from the previous revision;
1644 the text may also have changed. This includes files whose
1645 parent directory was renamed.
1646
1647 modified
1648 Text has changed since the previous revision.
1649
1650 kind changed
1651 File kind has been changed (e.g. from file to directory).
1652
1653 unknown
1654 Not versioned and not matching an ignore pattern.
1655
1656 To see ignored files use ´bzr ignored´. For details on the changes to
1657 file texts, use ´bzr diff´.
1658
1659 Note that --short or -S gives status flags for each item, similar to
1660 Subversion´s status command. To get output similar to svn -q, use bzr
1661 -SV.
1662
1663 If no arguments are specified, the status of the entire working direc‐
1664 tory is shown. Otherwise, only the status of the specified files or
1665 directories is reported. If a directory is given, status is reported
1666 for everything inside that directory.
1667
1668 If a revision argument is given, the status is calculated against that
1669 revision, or between two revisions if two are provided.
1670
1671
1672 bzr switch TO_LOCATION
1673 Options:
1674 --force Switch even if local commits will be
1675 lost.
1676 --help, -h Show help message.
1677 --quiet, -q Only display errors and warnings.
1678 --verbose, -v Display more information.
1679
1680 Set the branch of a checkout and update.
1681
1682 For lightweight checkouts, this changes the branch being referenced.
1683 For heavyweight checkouts, this checks that there are no local commits
1684 versus the current bound branch, then it makes the local branch a mir‐
1685 ror of the new location and binds to it.
1686
1687 In both cases, the working tree is updated and uncommitted changes are
1688 merged. The user can commit or revert these as they desire.
1689
1690 Pending merges need to be committed or reverted before using switch.
1691
1692
1693 bzr tag TAG_NAME
1694 Options:
1695 --delete Delete this tag rather than placing it.
1696 --directory ARG, -d Branch in which to place the tag.
1697 --force Replace existing tags.
1698 --help, -h Show help message.
1699 --quiet, -q Only display errors and warnings.
1700 --revision ARG, -r See "help revisionspec" for details.
1701 --verbose, -v Display more information.
1702
1703 See also: commit, tags
1704
1705 Create, remove or modify a tag naming a revision.
1706
1707 Tags give human-meaningful names to revisions. Commands that take a -r
1708 (--revision) option can be given -rtag:X, where X is any previously
1709 created tag.
1710
1711 Tags are stored in the branch. Tags are copied from one branch to
1712 another along when you branch, push, pull or merge.
1713
1714 It is an error to give a tag name that already exists unless you pass
1715 --force, in which case the tag is moved to point to the new revision.
1716
1717
1718 bzr tags
1719 Options:
1720 --directory ARG, -d Branch whose tags should be displayed.
1721 --help, -h Show help message.
1722 --quiet, -q Only display errors and warnings.
1723 --show-ids Show internal object ids.
1724 --sort ARG Sort tags by different criteria.
1725 --verbose, -v Display more information.
1726
1727 See also: tag
1728
1729 List tags.
1730
1731 This command shows a table of tag names and the revisions they refer‐
1732 ence.
1733
1734
1735 bzr testament [BRANCH]
1736 Options:
1737 --help, -h Show help message.
1738 --long Produce long-format testament.
1739 --quiet, -q Only display errors and warnings.
1740 --revision ARG, -r See "help revisionspec" for details.
1741 --strict Produce a strict-format testament.
1742 --verbose, -v Display more information.
1743
1744 Show testament (signing-form) of a revision.
1745
1746
1747 bzr unbind
1748 Options:
1749 --help, -h Show help message.
1750 --quiet, -q Only display errors and warnings.
1751 --verbose, -v Display more information.
1752
1753 See also: bind, checkouts
1754
1755 Convert the current checkout into a regular branch.
1756
1757 After unbinding, the local branch is considered independent and subse‐
1758 quent commits will be local only.
1759
1760
1761 bzr uncommit [LOCATION]
1762 Options:
1763 --dry-run Don´t actually make changes.
1764 --force Say yes to all questions.
1765 --help, -h Show help message.
1766 --quiet, -q Only display errors and warnings.
1767 --revision ARG, -r See "help revisionspec" for details.
1768 --verbose, -v Display more information.
1769
1770 See also: commit
1771
1772 Remove the last committed revision.
1773
1774 --verbose will print out what is being removed. --dry-run will go
1775 through all the motions, but not actually remove anything.
1776
1777 If --revision is specified, uncommit revisions to leave the branch at
1778 the specified revision. For example, "bzr uncommit -r 15" will leave
1779 the branch at revision 15.
1780
1781 In the future, uncommit will create a revision bundle, which can then
1782 be re-applied.
1783
1784
1785 bzr update [DIR]
1786 Options:
1787 --help, -h Show help message.
1788 --quiet, -q Only display errors and warnings.
1789 --verbose, -v Display more information.
1790
1791 Alias: up
1792
1793 See also: pull, status-flags, working-trees
1794
1795 Update a tree to have the latest code committed to its branch.
1796
1797 This will perform a merge into the working tree, and may generate con‐
1798 flicts. If you have any local changes, you will still need to commit
1799 them after the update for the update to be complete.
1800
1801 If you want to discard your local changes, you can just do a ´bzr
1802 revert´ instead of ´bzr commit´ after the update.
1803
1804
1805 bzr upgrade [URL]
1806 Options:
1807 --format ARG Upgrade to a specific format. See "bzr
1808 help formats" for details.
1809 --default New in 0.92: Pack-based format with data
1810 compatible with dirstate-tags format
1811 repositories. Interoperates with bzr
1812 repositories before 0.92 but cannot be
1813 read by bzr < 0.92. Previously called
1814 knitpack-experimental. For more
1815 information, see http://doc.bazaar-
1816 vcs.org/latest/developers/packrepo.html.
1817 --development Current development format. Can convert
1818 data to and from pack-0.92 (and anything
1819 compatible with pack-0.92) format
1820 repositories. Repositories in this
1821 format can only be read by bzr.dev.
1822 Please read http://doc.bazaar-
1823 vcs.org/latest/developers/development-
1824 repo.html before use.
1825 --development-subtree Current development format, subtree
1826 variant. Can convert data to and from
1827 pack-0.92 (and anything compatible with
1828 pack-0.92) format repositories.
1829 Repositories in this format can only be
1830 read by bzr.dev. Please read http://doc
1831 .bazaar-vcs.org/latest/developers
1832 /development-repo.html before use.
1833 --dirstate New in 0.15: Fast local operations.
1834 Compatible with bzr 0.8 and above when
1835 accessed over the network.
1836 --dirstate-tags New in 0.15: Fast local operations and
1837 improved scaling for network operations.
1838 Additionally adds support for tags.
1839 Incompatible with bzr < 0.15.
1840 --knit Format using knits. Recommended for
1841 interoperation with bzr <= 0.14.
1842 --metaweave Transitional format in 0.8. Slower than
1843 knit.
1844 --pack-0.92 New in 0.92: Pack-based format with data
1845 compatible with dirstate-tags format
1846 repositories. Interoperates with bzr
1847 repositories before 0.92 but cannot be
1848 read by bzr < 0.92. Previously called
1849 knitpack-experimental. For more
1850 information, see http://doc.bazaar-
1851 vcs.org/latest/developers/packrepo.html.
1852 --rich-root New in 1.0. Better handling of tree
1853 roots. Incompatible with bzr < 1.0
1854 --rich-root-pack New in 1.0: Pack-based format with data
1855 compatible with rich-root format
1856 repositories. Incompatible with bzr <
1857 1.0
1858 --weave Pre-0.8 format. Slower than knit and
1859 does not support checkouts or shared
1860 repositories.
1861 --help, -h Show help message.
1862 --quiet, -q Only display errors and warnings.
1863 --verbose, -v Display more information.
1864
1865 See also: check
1866
1867 Upgrade branch storage to current format.
1868
1869 The check command or bzr developers may sometimes advise you to run
1870 this command. When the default format has changed you may also be
1871 warned during other operations to upgrade.
1872
1873
1874 bzr version
1875 Options:
1876 --help, -h Show help message.
1877 --quiet, -q Only display errors and warnings.
1878 --verbose, -v Display more information.
1879
1880 Show version of bzr.
1881
1882
1883 bzr version-info [LOCATION]
1884 Options:
1885 --all Include all possible information.
1886 --check-clean Check if tree is clean.
1887 --format ARG Select the output format.
1888 --custom Version info in Custom template-based
1889 format.
1890 --python Version info in Python format.
1891 --rio Version info in RIO (simple text) format
1892 (default).
1893 --help, -h Show help message.
1894 --include-file-revisions Include the last revision for each file.
1895 --include-history Include the revision-history.
1896 --quiet, -q Only display errors and warnings.
1897 --template ARG Template for the output.
1898 --verbose, -v Display more information.
1899
1900 Show version information about this tree.
1901
1902 You can use this command to add information about version into source
1903 code of an application. The output can be in one of the supported for‐
1904 mats or in a custom format based on a template.
1905
1906 For example:
1907
1908 bzr version-info --custom \
1909 --template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n"
1910
1911 will produce a C header file with formatted string containing the cur‐
1912 rent revision number. Other supported variables in templates are:
1913
1914 * {date} - date of the last revision
1915 * {build_date} - current date
1916 * {revno} - revision number
1917 * {revision_id} - revision id
1918 * {branch_nick} - branch nickname
1919 * {clean} - 0 if the source tree contains uncommitted changes,
1920 otherwise 1
1921
1922
1923 bzr whoami [NAME]
1924 Options:
1925 --branch Set identity for the current branch
1926 instead of globally.
1927 --email Display email address only.
1928 --help, -h Show help message.
1929 --quiet, -q Only display errors and warnings.
1930 --verbose, -v Display more information.
1931
1932 Show or set bzr user id.
1933
1934 Examples:
1935 Show the email of the current user:
1936
1937 bzr whoami --email
1938
1939 Set the current user:
1940
1941 bzr whoami "Frank Chu <fchu@example.com>"
1942
1943
1945 BZRPATH
1946 Path where bzr is to look for shell plugin external commands.
1947
1948 BZR_EMAIL
1949 E-Mail address of the user. Overrides default user config.
1950
1951 EMAIL E-Mail address of the user. Overrides default user config.
1952
1953 BZR_EDITOR
1954 Editor for editing commit messages
1955
1956 EDITOR Editor for editing commit messages
1957
1958 BZR_PLUGIN_PATH
1959 Paths where bzr should look for plugins
1960
1961 BZR_HOME
1962 Home directory for bzr
1963
1965 ~/.bazaar/bazaar.conf
1966 Contains the user´s default configuration. The section [DEFAULT]
1967 is used to define general configuration that will be applied
1968 everywhere. The section [ALIASES] can be used to create command
1969 aliases for commonly used options.
1970
1971 A typical config file might look something like:
1972
1973 [DEFAULT]
1974 email=John Doe <jdoe@isp.com>
1975 [ALIASES]
1976 commit = commit --strict
1977 log10 = log --short -r -10..-1
1978
1980 http://www.bazaar-vcs.org/
1981
1982
1983
19841.3.1 2008-04-27 bzr(1)