1brz(1) Breezy brz(1)
3
7 brz - Breezy next-generation distributed version control
8
10 brz command [ command_options ]
11 brz help
12 brz help command
13
15 Breezy (or brz) is a distributed version control system that is power‐
16 ful, friendly, and scalable. Breezy is a fork of the Bazaar version
17 control system.
18 Breezy keeps track of changes to software source code (or similar in‐
20 formation); lets you explore who changed it, when, and why; merges con‐
21 current changes; and helps people work together in a team.
22
24 brz add [FILE...]
25 Add specified files or directories.
26 brz alias [NAME]
28 Set/unset and display aliases.
29 brz annotate FILENAME
31 Show the origin of each line in a file.
32 brz bind [LOCATION]
34 Convert the current branch into a checkout of the supplied
35 branch.
36 brz bisect SUBCOMMAND [ARGS...]
38 Find an interesting commit using a binary search.
39 brz branch FROM_LOCATION [TO_LOCATION]
41 Create a new branch that is a copy of an existing branch.
42 brz branches [LOCATION]
44 List the branches available at the current location.
45 brz break-lock [LOCATION]
47 Break a dead lock.
48 brz cat FILENAME
50 Write the contents of a file as of a given revision to standard
51 output.
52 brz check [PATH]
54 Validate working tree structure, branch consistency and reposi‐
55 tory history.
56 brz checkout [BRANCH_LOCATION] [TO_LOCATION]
58 Create a new checkout of an existing branch.
59 brz clean-tree
61 Remove unwanted files from working tree.
62 brz clone FROM_LOCATION [TO_LOCATION]
64 Clone a control directory.
65 brz commit [SELECTED...]
67 Commit changes into a new revision.
68 brz config [NAME]
70 Display, set or remove a configuration option.
71 brz conflicts
73 List files with conflicts.
74 brz cp [NAMES...]
76 Copy a file.
77 brz deleted
79 List files deleted in the working tree.
80 brz diff [FILE...]
82 Show differences in the working tree, between revisions or
83 branches.
84 brz export DEST [BRANCH_OR_SUBDIR]
86 Export current or past revision to a destination directory or
87 archive.
88 brz grep PATTERN [PATH...]
90 Print lines matching PATTERN for specified files and revisions.
91 brz help [TOPIC]
93 Show help on a command or other topic.
94 brz ignore [NAME_PATTERN...]
96 Ignore specified files or patterns.
97 brz ignored
99 List ignored files and the patterns that matched them.
100 brz import SOURCE [TREE]
102 Import sources from a directory, tarball or zip file
103 brz info [LOCATION]
105 Show information about a working tree, branch or repository.
106 brz init [LOCATION]
108 Make a directory into a versioned branch.
109 brz init-shared-repository LOCATION
111 Create a shared repository for branches to share storage space.
112 brz join TREE
114 Combine a tree into its containing tree.
115 brz launchpad-login [NAME]
117 Show or set the Launchpad user ID.
118 brz launchpad-logout
120 Unset the Launchpad user ID.
121 brz launchpad-open [LOCATION]
123 Open a Launchpad branch page in your web browser.
124 brz link-tree LOCATION
126 Hardlink matching files to another tree.
127 brz log [FILE...]
129 Show historical log for a branch or subset of a branch.
130 brz lp-find-proposal
132 Find the proposal to merge this revision.
133 brz ls [PATH]
135 List files in a tree.
136 brz merge [LOCATION]
138 Perform a three-way merge.
139 brz missing [OTHER_BRANCH]
141 Show unmerged/unpulled revisions between two branches.
142 brz mkdir DIR...
144 Create a new versioned directory.
145 brz mv [NAMES...]
147 Move or rename a file.
148 brz nick [NICKNAME]
150 Print or set the branch nickname.
151 brz pack [BRANCH_OR_REPO]
153 Compress the data within a repository.
154 brz patch [FILENAME]
156 Apply a named patch to the current tree.
157 brz ping LOCATION
159 Pings a Bazaar smart server.
160 brz plugins
162 List the installed plugins.
163 brz pull [LOCATION]
165 Turn this branch into a mirror of another branch.
166 brz push [LOCATION]
168 Update a mirror of this branch.
169 brz reconcile [BRANCH]
171 Reconcile brz metadata in a branch.
172 brz reconfigure [LOCATION]
174 Reconfigure the type of a brz directory.
175 brz remerge [FILE...]
177 Redo a merge.
178 brz remove [FILE...]
180 Remove files or directories.
181 brz remove-branch [LOCATION]
183 Remove a branch.
184 brz remove-tree [LOCATION...]
186 Remove the working tree from a given branch/checkout.
187 brz renames [DIR]
189 Show list of renamed files.
190 brz resolve [FILE...]
192 Mark a conflict as resolved.
193 brz revert [FILE...]
195 Set files in the working tree back to the contents of a previous
196 revision.
197 brz revno [LOCATION]
199 Show current revision number.
200 brz root [FILENAME]
202 Show the tree root directory.
203 brz send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
205 Mail or create a merge-directive for submitting changes.
206 brz serve
208 Run the brz server.
209 brz shelve [FILE...]
211 Temporarily set aside some changes from the current tree.
212 brz sign-my-commits [LOCATION] [COMMITTER]
214 Sign all commits by a given committer.
215 brz split TREE
217 Split a subdirectory of a tree into a separate tree.
218 brz status [FILE...]
220 Display status summary.
221 brz switch [TO_LOCATION]
223 Set the branch of a checkout and update.
224 brz tag [TAG_NAME]
226 Create, remove or modify a tag naming a revision.
227 brz tags
229 List tags.
230 brz testament [BRANCH]
232 Show testament (signing-form) of a revision.
233 brz unbind
235 Convert the current checkout into a regular branch.
236 brz uncommit [LOCATION]
238 Remove the last committed revision.
239 brz unshelve [SHELF_ID]
241 Restore shelved changes.
242 brz update [DIR]
244 Update a working tree to a new revision.
245 brz upgrade [URL]
247 Upgrade a repository, branch or working tree to a newer format.
248 brz verify-signatures [LOCATION]
250 Verify all commit signatures.
251 brz version
253 Show version of brz.
254 brz version-info [LOCATION]
256 Show version information about this tree.
257 brz view [FILE...]
259 Manage filtered views.
260 brz whoami [NAME]
262 Show or set brz user id.
263
265 brz --help
266 Alias for "help", see "brz help".
267 brz -?
269 Alias for "help", see "brz help".
270 brz -h
272 Alias for "help", see "brz help".
273 brz ?
275 Alias for "help", see "brz help".
276 brz add [FILE...]
278 Options:
279 --dry-run Show what would be done, but don't
280 actually do anything.
281 --file-ids-from ARG Lookup file ids from this tree.
282 --help, -h Show help message.
283 --no-recurse, -N Don't recursively add the contents of
284 directories.
285 --quiet, -q Only display errors and warnings.
286 --usage Show usage message and options.
287 --verbose, -v Display more information.
288 See also: ignore, remove
290 Add specified files or directories.
292 In non-recursive mode, all the named items are added, regardless of
294 whether they were previously ignored. A warning is given if any of the
295 named files are already versioned.
296 In recursive mode (the default), files are treated the same way but the
298 behaviour for directories is different. Directories that are already
299 versioned do not give a warning. All directories, whether already ver‐
300 sioned or not, are searched for files or subdirectories that are nei‐
301 ther versioned or ignored, and these are added. This search proceeds
302 recursively into versioned directories. If no names are given '.' is
303 assumed.
304 A warning will be printed when nested trees are encountered, unless
306 they are explicitly ignored.
307 Therefore simply saying 'brz add' will version all files that are cur‐
309 rently unknown.
310 Adding a file whose parent directory is not versioned will implicitly
312 add the parent, and so on up to the root. This means you should never
313 need to explicitly add a directory, they'll just get added when you add
314 a file in the directory.
315 --dry-run will show which files would be added, but not actually add
317 them.
318 --file-ids-from will try to use the file ids from the supplied path.
320 It looks up ids trying to find a matching parent directory with the
321 same filename, and then by pure path. This option is rarely needed but
322 can be useful when adding the same logical file into two branches that
323 will be merged later (without showing the two different adds as a con‐
324 flict). It is also useful when merging another project into a subdirec‐
325 tory of this one.
326 Any files matching patterns in the ignore list will not be added unless
328 they are explicitly mentioned.
329 In recursive mode, files larger than the configuration option add.maxi‐
331 mum_file_size will be skipped. Named items are never skipped due to
332 file size.
333 brz alias [NAME]
336 Options:
337 --help, -h Show help message.
338 --quiet, -q Only display errors and warnings.
339 --remove Remove the alias.
340 --usage Show usage message and options.
341 --verbose, -v Display more information.
342 Set/unset and display aliases.
344 Examples:
346 Show the current aliases:
347 brz alias
349 Show the alias specified for 'll':
351 brz alias ll
353 Set an alias for 'll':
355 brz alias ll="log --line -r-10..-1"
357 To remove an alias for 'll':
359 brz alias --remove ll
361 brz ann
364 Alias for "annotate", see "brz annotate".
365 brz annotate FILENAME
367 Options:
368 --all Show annotations on all lines.
369 --directory ARG, -d Branch to operate on, instead of working
370 directory.
371 --help, -h Show help message.
372 --long Show commit date in annotations.
373 --quiet, -q Only display errors and warnings.
374 --revision ARG, -r See "help revisionspec" for details.
375 --show-ids Show internal object ids.
376 --usage Show usage message and options.
377 --verbose, -v Display more information.
378 Aliases: ann, blame, praise
380 Show the origin of each line in a file.
382 This prints out the given file with an annotation on the left side in‐
384 dicating which revision, author and date introduced the change.
385 If the origin is the same for a run of consecutive lines, it is shown
387 only at the top, unless the --all option is given.
388 brz bind [LOCATION]
391 Options:
392 --directory ARG, -d Branch to operate on, instead of working
393 directory.
394 --help, -h Show help message.
395 --quiet, -q Only display errors and warnings.
396 --usage Show usage message and options.
397 --verbose, -v Display more information.
398 See also: checkouts, unbind
400 Convert the current branch into a checkout of the supplied branch. If
402 no branch is supplied, rebind to the last bound location.
403 Once converted into a checkout, commits must succeed on the master
405 branch before they will be applied to the local branch.
406 Bound branches use the nickname of its master branch unless it is set
408 locally, in which case binding will update the local nickname to be
409 that of the master.
410 brz bisect SUBCOMMAND [ARGS...]
413 Options:
414 --directory ARG, -d Branch to operate on, instead of working
415 directory.
416 --help, -h Show help message.
417 --output ARG, -o Write log to this file.
418 --quiet, -q Only display errors and warnings.
419 --revision ARG, -r See "help revisionspec" for details.
420 --usage Show usage message and options.
421 --verbose, -v Display more information.
422 Find an interesting commit using a binary search.
424 Bisecting, in a nutshell, is a way to find the commit at which some
426 testable change was made, such as the introduction of a bug or feature.
427 By identifying a version which did not have the interesting change and
428 a later version which did, a developer can test for the presence of the
429 change at various points in the history, eventually ending up at the
430 precise commit when the change was first introduced.
431 This command uses subcommands to implement the search, each of which
433 changes the state of the bisection. The subcommands are:
434 brz bisect start
436 Start a bisect, possibly clearing out a previous bisect.
437 brz bisect yes [-r rev]
439 The specified revision (or the current revision, if not given)
440 has the characteristic we're looking for,
441 brz bisect no [-r rev]
443 The specified revision (or the current revision, if not given)
444 does not have the characteristic we're looking for,
445 brz bisect move -r rev
447 Switch to a different revision manually. Use if the bisect
448 algorithm chooses a revision that is not suitable. Try to
449 move as little as possible.
450 brz bisect reset
452 Clear out a bisection in progress.
453 brz bisect log [-o file]
455 Output a log of the current bisection to standard output, or
456 to the specified file.
457 brz bisect replay <logfile>
459 Replay a previously-saved bisect log, forgetting any bisection
460 that might be in progress.
461 brz bisect run <script>
463 Bisect automatically using <script> to determine 'yes' or 'no'.
464 <script> should exit with:
465 0 for yes
466 125 for unknown (like build failed so we could not test)
467 anything else for no
468 brz blame
471 Alias for "annotate", see "brz annotate".
472 brz branch FROM_LOCATION [TO_LOCATION]
474 Options:
475 --bind Bind new branch to from location.
476 --colocated-branch ARG, -bName of colocated branch to sprout.
477 --files-from ARG Get file contents from this tree.
478 --hardlink Hard-link working tree files where
479 possible.
480 --help, -h Show help message.
481 --no-recurse-nested Do not recursively check out nested
482 trees.
483 --no-tree Create a branch without a working-tree.
484 --quiet, -q Only display errors and warnings.
485 --revision ARG, -r See "help revisionspec" for details.
486 --stacked Create a stacked branch referring to the
487 source branch. The new branch will
488 depend on the availability of the source
489 branch for all operations.
490 --standalone Do not use a shared repository, even if
491 available.
492 --switch Switch the checkout in the current
493 directory to the new branch.
494 --usage Show usage message and options.
495 --use-existing-dir By default branch will fail if the
496 target directory exists, but does not
497 already have a control directory. This
498 flag will allow branch to proceed.
499 --verbose, -v Display more information.
500 See also: checkout
502 Create a new branch that is a copy of an existing branch.
504 If the TO_LOCATION is omitted, the last component of the FROM_LOCATION
506 will be used. In other words, "branch ../foo/bar" will attempt to cre‐
507 ate ./bar. If the FROM_LOCATION has no / or path separator embedded,
508 the TO_LOCATION is derived from the FROM_LOCATION by stripping a lead‐
509 ing scheme or drive identifier, if any. For example, "branch
510 lp:foo-bar" will attempt to create ./foo-bar.
511 To retrieve the branch as of a particular revision, supply the --revi‐
513 sion parameter, as in "branch foo/bar -r 5".
514 brz branches [LOCATION]
517 Options:
518 --help, -h Show help message.
519 --quiet, -q Only display errors and warnings.
520 --recursive, -R Recursively scan for branches rather
521 than just looking in the specified
522 location.
523 --usage Show usage message and options.
524 --verbose, -v Display more information.
525 List the branches available at the current location.
527 This command will print the names of all the branches at the current
529 location.
530 brz break-lock [LOCATION]
533 Options:
534 --config LOCATION is the directory where the
535 config lock is.
536 --force Do not ask for confirmation before
537 breaking the lock.
538 --help, -h Show help message.
539 --quiet, -q Only display errors and warnings.
540 --usage Show usage message and options.
541 --verbose, -v Display more information.
542 Break a dead lock.
544 This command breaks a lock on a repository, branch, working directory
546 or config file.
547 CAUTION: Locks should only be broken when you are sure that the process
549 holding the lock has been stopped.
550 You can get information on what locks are open via the 'brz info [loca‐
552 tion]' command.
553 Examples:
555 brz break-lock
556 brz break-lock brz+ssh://example.com/brz/foo
557 brz break-lock --conf ~/.config/breezy
558 brz cat FILENAME
561 Options:
562 --directory ARG, -d Branch to operate on, instead of working
563 directory.
564 --filters Apply content filters to display the
565 convenience form.
566 --help, -h Show help message.
567 --name-from-revision The path name in the old tree.
568 --quiet, -q Only display errors and warnings.
569 --revision ARG, -r See "help revisionspec" for details.
570 --usage Show usage message and options.
571 --verbose, -v Display more information.
572 See also: ls
574 Write the contents of a file as of a given revision to standard output.
576 If no revision is nominated, the last revision is used.
578 Note: Take care to redirect standard output when using this command on
580 a binary file.
581 brz check [PATH]
584 Options:
585 --branch Check the branch related to the current
586 directory.
587 --help, -h Show help message.
588 --quiet, -q Only display errors and warnings.
589 --repo Check the repository related to the
590 current directory.
591 --tree Check the working tree related to the
592 current directory.
593 --usage Show usage message and options.
594 --verbose, -v Display more information.
595 See also: reconcile
597 Validate working tree structure, branch consistency and repository his‐
599 tory.
600 This command checks various invariants about branch and repository
602 storage to detect data corruption or brz bugs.
603 The working tree and branch checks will only give output if a problem
605 is detected. The output fields of the repository check are:
606 revisions
608 This is just the number of revisions checked. It doesn't
609 indicate a problem.
610 versionedfiles
612 This is just the number of versionedfiles checked. It
613 doesn't indicate a problem.
614 unreferenced ancestors
616 Texts that are ancestors of other texts, but
617 are not properly referenced by the revision ancestry. This is a
618 subtle problem that Breezy can work around.
619 unique file texts
621 This is the total number of unique file contents
622 seen in the checked revisions. It does not indicate a problem.
623 repeated file texts
625 This is the total number of repeated texts seen
626 in the checked revisions. Texts can be repeated when their file
627 entries are modified, but the file contents are not. It does not
628 indicate a problem.
629 If no restrictions are specified, all data that is found at the given
631 location will be checked.
632 Examples:
634 Check the tree and branch at 'foo':
636 brz check --tree --branch foo
638 Check only the repository at 'bar':
640 brz check --repo bar
642 Check everything at 'baz':
644 brz check baz
646 brz checkin
649 Alias for "commit", see "brz commit".
650 brz checkout [BRANCH_LOCATION] [TO_LOCATION]
652 Options:
653 --files-from ARG Get file contents from this tree.
654 --hardlink Hard-link working tree files where
655 possible.
656 --help, -h Show help message.
657 --lightweight Perform a lightweight checkout.
658 Lightweight checkouts depend on access
659 to the branch for every operation.
660 Normal checkouts can perform common
661 operations like diff and status without
662 such access, and also support local
663 commits.
664 --quiet, -q Only display errors and warnings.
665 --revision ARG, -r See "help revisionspec" for details.
666 --usage Show usage message and options.
667 --verbose, -v Display more information.
668 Alias: co
670 See also: branch, checkouts, remove-tree, working-trees
672 Create a new checkout of an existing branch.
674 If BRANCH_LOCATION is omitted, checkout will reconstitute a working
676 tree for the branch found in '.'. This is useful if you have removed
677 the working tree or if it was never created - i.e. if you pushed the
678 branch to its current location using SFTP.
679 If the TO_LOCATION is omitted, the last component of the BRANCH_LOCA‐
681 TION will be used. In other words, "checkout ../foo/bar" will attempt
682 to create./bar. If the BRANCH_LOCATION has no / or path separator em‐
683 bedded, the TO_LOCATION is derived from the BRANCH_LOCATION by strip‐
684 ping a leading scheme or drive identifier, if any. For example, "check‐
685 out lp:foo-bar" will attempt to create ./foo-bar.
686 To retrieve the branch as of a particular revision, supply the --revi‐
688 sion parameter, as in "checkout foo/bar -r 5". Note that this will be
689 immediately out of date [so you cannot commit] but it may be useful
690 (i.e. to examine old code.)
691 brz ci
694 Alias for "commit", see "brz commit".
695 brz clean-tree
697 Options:
698 --detritus Delete conflict files, merge and revert
699 backups, and failed selftest dirs.
700 --directory ARG, -d Branch to operate on, instead of working
701 directory.
702 --dry-run Show files to delete instead of deleting
703 them.
704 --force Do not prompt before deleting.
705 --help, -h Show help message.
706 --ignored Delete all ignored files.
707 --quiet, -q Only display errors and warnings.
708 --unknown Delete files unknown to brz (default).
709 --usage Show usage message and options.
710 --verbose, -v Display more information.
711 Remove unwanted files from working tree.
713 By default, only unknown files, not ignored files, are deleted. Ver‐
715 sioned files are never deleted.
716 Another class is 'detritus', which includes files emitted by brz during
718 normal operations and selftests. (The value of these files decreases
719 with time.)
720 If no options are specified, unknown files are deleted. Otherwise, op‐
722 tion flags are respected, and may be combined.
723 To check what clean-tree will do, use --dry-run.
725 brz clone FROM_LOCATION [TO_LOCATION]
728 Options:
729 --help, -h Show help message.
730 --no-recurse-nested Do not recursively check out nested
731 trees.
732 --quiet, -q Only display errors and warnings.
733 --revision ARG, -r See "help revisionspec" for details.
734 --usage Show usage message and options.
735 --verbose, -v Display more information.
736 Clone a control directory.
738 brz co
742 Alias for "checkout", see "brz checkout".
743 brz commit [SELECTED...]
745 Options:
746 --author ARG Set the author's name, if it's different
747 from the committer.
748 --bugs ARG Link to a related bug. (see "brz help
749 bugs").
750 --commit-time ARG Manually set a commit time using commit
751 date format, e.g. '2009-10-10 08:00:00
752 +0100'.
753 --exclude ARG, -x Do not consider changes made to a given
754 path.
755 --file MSGFILE, -F Take commit message from this file.
756 --fixes ARG Mark a bug as being fixed by this
757 revision (see "brz help bugs").
758 --help, -h Show help message.
759 --local Perform a local commit in a bound
760 branch. Local commits are not pushed to
761 the master branch until a normal commit
762 is performed.
763 --lossy When committing to a foreign version
764 control system do not push data that can
765 not be natively represented.
766 --message ARG, -m Description of the new revision.
767 --quiet, -q Only display errors and warnings.
768 --show-diff, -p When no message is supplied, show the
769 diff along with the status summary in
770 the message editor.
771 --strict Refuse to commit if there are unknown
772 files in the working tree.
773 --unchanged Commit even if nothing has changed.
774 --usage Show usage message and options.
775 --verbose, -v Display more information.
776 Aliases: ci, checkin
778 See also: add, bugs, hooks, uncommit
780 Commit changes into a new revision.
782 An explanatory message needs to be given for each commit. This is often
784 done by using the --message option (getting the message from the com‐
785 mand line) or by using the --file option (getting the message from a
786 file). If neither of these options is given, an editor is opened for
787 the user to enter the message. To see the changed files in the boiler‐
788 plate text loaded into the editor, use the --show-diff option.
789 By default, the entire tree is committed and the person doing the com‐
791 mit is assumed to be the author. These defaults can be overridden as
792 explained below.
793 Selective commits:
795 If selected files are specified, only changes to those files are
797 committed. If a directory is specified then the directory and
798 everything within it is committed.
799 When excludes are given, they take precedence over selected files.
801 For example, to commit only changes within foo, but not changes
802 within foo/bar:
803 brz commit foo -x foo/bar
805 A selective commit after a merge is not yet supported.
807 Custom authors:
809 If the author of the change is not the same person as the committer,
811 you can specify the author's name using the --author option. The
812 name should be in the same format as a committer-id, e.g.
813 "John Doe <jdoe@example.com>". If there is more than one author of
814 the change you can specify the option multiple times, once for each
815 author.
816 Checks:
818 A common mistake is to forget to add a new file or directory before
820 running the commit command. The --strict option checks for unknown
821 files and aborts the commit if any are found. More advanced pre-com‐
822 mit
823 checks can be implemented by defining hooks. See \*(Aq\*(Aqbrz help
824 hooks\*(Aq\*(Aq
825 for details.
826 Things to note:
828 If you accidentally commit the wrong changes or make a spelling
830 mistake in the commit message say, you can use the uncommit command
831 to undo it. See \*(Aq\*(Aqbrz help uncommit\*(Aq\*(Aq for details.
832 Hooks can also be configured to run after a commit. This allows you
834 to trigger updates to external systems like bug trackers. The --fixes
835 option can be used to record the association between a revision and
836 one or more bugs. See \*(Aq\*(Aqbrz help bugs\*(Aq\*(Aq for details.
837 brz config [NAME]
840 Options:
841 --all Display all the defined values for the
842 matching options.
843 --directory ARG, -d Branch to operate on, instead of working
844 directory.
845 --help, -h Show help message.
846 --quiet, -q Only display errors and warnings.
847 --remove Remove the option from the configuration
848 file.
849 --scope ARG Reduce the scope to the specified
850 configuration file.
851 --usage Show usage message and options.
852 --verbose, -v Display more information.
853 See also: configuration
855 Display, set or remove a configuration option.
857 Display the active value for option NAME.
859 If --all is specified, NAME is interpreted as a regular expression and
861 all matching options are displayed mentioning their scope and without
862 resolving option references in the value). The active value that bzr
863 will take into account is the first one displayed for each option.
864 If NAME is not given, --all .* is implied (all options are displayed
866 for the current scope).
867 Setting a value is achieved by using NAME=value without spaces. The
869 value is set in the most relevant scope and can be checked by display‐
870 ing the option again.
871 Removing a value is achieved by using --remove NAME.
873 brz conflicts
876 Options:
877 --directory ARG, -d Branch to operate on, instead of working
878 directory.
879 --help, -h Show help message.
880 --quiet, -q Only display errors and warnings.
881 --text List paths of files with text conflicts.
882 --usage Show usage message and options.
883 --verbose, -v Display more information.
884 See also: conflict-types, resolve
886 List files with conflicts.
888 Merge will do its best to combine the changes in two branches, but
890 there are some kinds of problems only a human can fix. When it encoun‐
891 ters those, it will mark a conflict. A conflict means that you need to
892 fix something, before you can commit.
893 Conflicts normally are listed as short, human-readable messages. If
895 --text is supplied, the pathnames of files with text conflicts are
896 listed, instead. (This is useful for editing all files with text con‐
897 flicts.)
898 Use brz resolve when you have fixed a problem.
900 brz copy
903 Alias for "cp", see "brz cp".
904 brz cp [NAMES...]
906 Options:
907 --help, -h Show help message.
908 --quiet, -q Only display errors and warnings.
909 --usage Show usage message and options.
910 --verbose, -v Display more information.
911 Alias: copy
913 Copy a file.
915 Usage:
917 brz cp OLDNAME NEWNAME
918 brz cp SOURCE... DESTINATION
920 If the last argument is a versioned directory, all the other names are
922 copied into it. Otherwise, there must be exactly two arguments and the
923 file is copied to a new name.
924 Files cannot be copied between branches. Only files can be copied at
926 the moment.
927 brz del
930 Alias for "remove", see "brz remove".
931 brz deleted
933 Options:
934 --directory ARG, -d Branch to operate on, instead of working
935 directory.
936 --help, -h Show help message.
937 --quiet, -q Only display errors and warnings.
938 --show-ids Show internal object ids.
939 --usage Show usage message and options.
940 --verbose, -v Display more information.
941 See also: ls, status
943 List files deleted in the working tree.
945 brz di
949 Alias for "diff", see "brz diff".
950 brz dif
952 Alias for "diff", see "brz diff".
953 brz diff [FILE...]
955 Options:
956 --change ARG, -c Select changes introduced by the
957 specified revision. See also "help
958 revisionspec".
959 --check-style Warn if trailing whitespace or spurious
960 changes have been added.
961 --color ARG Color mode to use. "always": Always
962 colorize output (default). "auto": Only
963 colorize output if terminal supports it
964 and STDOUT is a TTY. "never": Never
965 colorize output.
966 --context ARG How many lines of context to show.
967 --diff-options ARG Pass these options to the external diff
968 program.
969 --format ARG, -F Diff format to use.
970 --help, -h Show help message.
971 --new ARG Branch/tree to compare to.
972 --old ARG Branch/tree to compare from.
973 --prefix ARG, -p Set prefixes added to old and new
974 filenames, as two values separated by a
975 colon. (eg "old/:new/").
976 --quiet, -q Only display errors and warnings.
977 --revision ARG, -r See "help revisionspec" for details.
978 --usage Show usage message and options.
979 --using ARG Use this command to compare files.
980 --verbose, -v Display more information.
981 Aliases: di, dif
983 See also: status
985 Show differences in the working tree, between revisions or branches.
987 If no arguments are given, all changes for the current tree are listed.
989 If files are given, only the changes in those files are listed. Remote
990 and multiple branches can be compared by using the --old and --new op‐
991 tions. If not provided, the default for both is derived from the first
992 argument, if any, or the current tree if no arguments are given.
993 "brz diff -p1" is equivalent to "brz diff --prefix old/:new/", and pro‐
995 duces patches suitable for "patch -p1".
996 Note that when using the -r argument with a range of revisions, the
998 differences are computed between the two specified revisions. That is,
999 the command does not show the changes introduced by the first revision
1000 in the range. This differs from the interpretation of revision ranges
1001 used by "brz log" which includes the first revision in the range.
1002 Exit values:
1004 1 - changed
1005 2 - unrepresentable changes
1006 3 - error
1007 0 - no change
1008 Examples:
1010 Shows the difference in the working tree versus the last commit:
1011 brz diff
1013 Difference between the working tree and revision 1:
1015 brz diff -r1
1017 Difference between revision 3 and revision 1:
1019 brz diff -r1..3
1021 Difference between revision 3 and revision 1 for branch xxx:
1023 brz diff -r1..3 xxx
1025 The changes introduced by revision 2 (equivalent to -r1..2):
1027 brz diff -c2
1029 To see the changes introduced by revision X:
1031 brz diff -cX
1033 Note that in the case of a merge, the -c option shows the changes
1035 compared to the left hand parent. To see the changes against
1036 another parent, use:
1037 brz diff -r<chosen_parent>..X
1039 The changes between the current revision and the previous revision
1041 (equivalent to -c-1 and -r-2..-1)
1042 brz diff -r-2..
1044 Show just the differences for file NEWS:
1046 brz diff NEWS
1048 Show the differences in working tree xxx for file NEWS:
1050 brz diff xxx/NEWS
1052 Show the differences from branch xxx to this working tree:
1054 brz diff --old xxx
1056 Show the differences between two branches for file NEWS:
1058 brz diff --old xxx --new yyy NEWS
1060 Same as 'brz diff' but prefix paths with old/ and new/:
1062 brz diff --prefix old/:new/
1064 Show the differences using a custom diff program with options:
1066 brz diff --using /usr/bin/diff --diff-options -wu
1068 brz export DEST [BRANCH_OR_SUBDIR]
1071 Options:
1072 --directory ARG, -d Branch to operate on, instead of working
1073 directory.
1074 --filters Apply content filters to export the
1075 convenient form.
1076 --format ARG Type of file to export to.
1077 --help, -h Show help message.
1078 --per-file-timestamps Set modification time of files to that
1079 of the last revision in which it was
1080 changed.
1081 --quiet, -q Only display errors and warnings.
1082 --recurse-nested Include contents of nested trees.
1083 --revision ARG, -r See "help revisionspec" for details.
1084 --root ARG Name of the root directory inside the
1085 exported file.
1086 --uncommitted Export the working tree contents rather
1087 than that of the last revision.
1088 --usage Show usage message and options.
1089 --verbose, -v Display more information.
1090 Export current or past revision to a destination directory or archive.
1092 If no revision is specified this exports the last committed revision.
1094 Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1096 given, try to find the format with the extension. If no extension is
1097 found exports to a directory (equivalent to --format=dir).
1098 If root is supplied, it will be used as the root directory inside con‐
1100 tainer formats (tar, zip, etc). If it is not supplied it will default
1101 to the exported filename. The root option has no effect for 'dir' for‐
1102 mat.
1103 If branch is omitted then the branch containing the current working di‐
1105 rectory will be used.
1106 Note: Export of tree with non-ASCII filenames to zip is not supported.
1108 ================= =========================
1110 Supported formats Autodetected by extension
1111 ================= =========================
1112 dir (none)
1113 tar .tar
1114 tbz2 .tar.bz2, .tbz2
1115 tgz .tar.gz, .tgz
1116 zip .zip
1117 ================= =========================
1118 brz grep PATTERN [PATH...]
1121 Options:
1122 --color WHEN Show match in color. WHEN is never,
1123 always or auto.
1124 --diff, -p Grep for pattern in changeset for each
1125 revision.
1126 --exclude GLOB, -X Skip files whose base name matches GLOB.
1127 --files-with-matches, -l Print only the name of each input file
1128 in which PATTERN is found.
1129 --files-without-match, -L Print only the name of each input file
1130 in which PATTERN is not found.
1131 --fixed-string, -F Interpret PATTERN is a single fixed
1132 string (not regex).
1133 --from-root Search for pattern starting from the
1134 root of the branch. (implies
1135 --recursive)
1136 --help, -h Show help message.
1137 --ignore-case, -i Ignore case distinctions while matching.
1138 --include GLOB, -I Search only files whose base name
1139 matches GLOB.
1140 --levels N Number of levels to display - 0 for all,
1141 1 for collapsed (1 is default).
1142 --line-number, -n Show 1-based line number.
1143 --no-recursive Don't recurse into subdirectories.
1144 (default is --recursive)
1145 --null, -Z Write an ASCII NUL (\0) separator
1146 between output lines rather than a
1147 newline.
1148 --quiet, -q Only display errors and warnings.
1149 --revision ARG, -r See "help revisionspec" for details.
1150 --usage Show usage message and options.
1151 --verbose, -v Display more information.
1152 Print lines matching PATTERN for specified files and revisions.
1154 This command searches the specified files and revisions for a given
1156 pattern. The pattern is specified as a Python regular expressions[1].
1157 If the file name is not specified, the revisions starting with the cur‐
1159 rent directory are searched recursively. If the revision number is not
1160 specified, the working copy is searched. To search the last committed
1161 revision, use the '-r -1' or '-r last:1' option.
1162 Unversioned files are not searched unless explicitly specified on the
1164 command line. Unversioned directores are not searched.
1165 When searching a pattern, the output is shown in the 'filepath:string'
1167 format. If a revision is explicitly searched, the output is shown as
1168 'filepath~N:string', where N is the revision number.
1169 --include and --exclude options can be used to search only (or exclude
1171 from search) files with base name matches the specified Unix style GLOB
1172 pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \
1173 to quote wildcard or backslash character literally. Note that the glob
1174 pattern is not a regular expression.
1175 [1] http://docs.python.org/library/re.html#regular-expression-syntax
1177 brz help [TOPIC]
1180 Options:
1181 --help, -h Show help message.
1182 --long Show help on all commands.
1183 --quiet, -q Only display errors and warnings.
1184 --usage Show usage message and options.
1185 --verbose, -v Display more information.
1186 Aliases: ?, --help, -?, -h
1188 See also: topics
1190 Show help on a command or other topic.
1192 brz ignore [NAME_PATTERN...]
1196 Options:
1197 --default-rules Display the default ignore rules that
1198 brz uses.
1199 --directory ARG, -d Branch to operate on, instead of working
1200 directory.
1201 --help, -h Show help message.
1202 --quiet, -q Only display errors and warnings.
1203 --usage Show usage message and options.
1204 --verbose, -v Display more information.
1205 See also: ignored, patterns, status
1207 Ignore specified files or patterns.
1209 See \*(Aq\*(Aqbrz help patterns\*(Aq\*(Aq for details on the syntax of
1211 patterns.
1212 If a .bzrignore file does not exist, the ignore command will create one
1214 and add the specified files or patterns to the newly created file. The
1215 ignore command will also automatically add the.bzrignore file to be
1216 versioned. Creating a .bzrignore file without the use of the ignore
1217 command will require an explicit add command.
1218 To remove patterns from the ignore list, edit the .bzrignore file. Af‐
1220 ter adding, editing or deleting that file either indirectly by using
1221 this command or directly by using an editor, be sure to commit it.
1222 Breezy also supports a global ignore file ~/.config/breezy/ignore. On
1224 Windows the global ignore file can be found in the application data di‐
1225 rectory as C:\Documents and Settings\<user>\Application
1226 Data\Breezy\3.0\ignore. Global ignores are not touched by this com‐
1227 mand. The global ignore file can be edited directly using an editor.
1228 Patterns prefixed with '!' are exceptions to ignore patterns and take
1230 precedence over regular ignores. Such exceptions are used to specify
1231 files that should be versioned which would otherwise be ignored.
1232 Patterns prefixed with '!!' act as regular ignore patterns, but have
1234 precedence over the '!' exception patterns.
1235 Notes:
1237 * Ignore patterns containing shell wildcards must be quoted from
1239 the shell on Unix.
1240 * Ignore patterns starting with "#" act as comments in the ignore file.
1242 To ignore patterns that begin with that character, use the "RE:" pre‐
1243 fix.
1244 Examples:
1246 Ignore the top level Makefile:
1247 brz ignore ./Makefile
1249 Ignore .class files in all directories...:
1251 brz ignore "*.class"
1253 ...but do not ignore "special.class":
1255 brz ignore "!special.class"
1257 Ignore files whose name begins with the "#" character:
1259 brz ignore "RE:^#"
1261 Ignore .o files under the lib directory:
1263 brz ignore "lib/**/*.o"
1265 Ignore .o files under the lib directory:
1267 brz ignore "RE:lib/.*\.o"
1269 Ignore everything but the "debian" toplevel directory:
1271 brz ignore "RE:(?!debian/).*"
1273 Ignore everything except the "local" toplevel directory,
1275 but always ignore autosave files ending in ~, even under local/:
1276 brz ignore "*"
1278 brz ignore "!./local"
1279 brz ignore "!!*~"
1280 brz ignored
1283 Options:
1284 --directory ARG, -d Branch to operate on, instead of working
1285 directory.
1286 --help, -h Show help message.
1287 --quiet, -q Only display errors and warnings.
1288 --usage Show usage message and options.
1289 --verbose, -v Display more information.
1290 See also: ignore, ls
1292 List ignored files and the patterns that matched them.
1294 List all the ignored files and the ignore pattern that caused the file
1296 to be ignored.
1297 Alternatively, to list just the files:
1299 brz ls --ignored
1301 brz import SOURCE [TREE]
1304 Options:
1305 --help, -h Show help message.
1306 --quiet, -q Only display errors and warnings.
1307 --usage Show usage message and options.
1308 --verbose, -v Display more information.
1309 Import sources from a directory, tarball or zip file
1311 This command will import a directory, tarball or zip file into a bzr
1313 tree, replacing any versioned files already present. If a directory is
1314 specified, it is used as the target. If the directory does not exist,
1315 or is not versioned, it is created.
1316 Tarballs may be gzip or bzip2 compressed. This is autodetected.
1318 If the tarball or zip has a single root directory, that directory is
1320 stripped when extracting the tarball. This is not done for directo‐
1321 ries.
1322 brz info [LOCATION]
1325 Options:
1326 --help, -h Show help message.
1327 --quiet, -q Only display errors and warnings.
1328 --usage Show usage message and options.
1329 --verbose, -v Display more information.
1330 See also: repositories, revno, working-trees
1332 Show information about a working tree, branch or repository.
1334 This command will show all known locations and formats associated to
1336 the tree, branch or repository.
1337 In verbose mode, statistical information is included with each report.
1339 To see extended statistic information, use a verbosity level of 2 or
1340 higher by specifying the verbose option multiple times, e.g. -vv.
1341 Branches and working trees will also report any missing revisions.
1343 Examples:
1345 Display information on the format and related locations:
1347 brz info
1349 Display the above together with extended format information and
1351 basic statistics (like the number of files in the working tree and
1352 number of revisions in the branch and repository):
1353 brz info -v
1355 Display the above together with number of committers to the branch:
1357 brz info -vv
1359 brz init [LOCATION]
1362 Options:
1363 --append-revisions-only Never change revnos or the existing log.
1364 Append revisions to it only.
1365 --create-prefix Create the path leading up to the branch
1366 if it does not already exist.
1367 --format ARG Specify a format for this branch. See
1368 "help formats" for a full list.
1369 --2a Format for the bzr 2.0 series.
1370 --bzr Format for the bzr 2.0 series.
1371 --default Format for the bzr 2.0 series.
1372 --git GIT repository.
1373 --git-bare Bare GIT repository (no working tree).
1374 --help, -h Show help message.
1375 --no-tree Create a branch without a working tree.
1376 --quiet, -q Only display errors and warnings.
1377 --usage Show usage message and options.
1378 --verbose, -v Display more information.
1379 See also: branch, checkout, init-shared-repository
1381 Make a directory into a versioned branch.
1383 Use this to create an empty branch, or before importing an existing
1385 project.
1386 If there is a repository in a parent directory of the location, then
1388 the history of the branch will be stored in the repository. Otherwise
1389 init creates a standalone branch which carries its own history in the
1390 .bzr directory.
1391 If there is already a branch at the location but it has no working
1393 tree, the tree can be populated with 'brz checkout'.
1394 Recipe for importing a tree of files:
1396 cd ~/project
1398 brz init
1399 brz add .
1400 brz status
1401 brz commit -m "imported project"
1402 brz init-repo
1405 Alias for "init-shared-repository", see "brz init-shared-repository".
1406 brz init-shared-repo
1408 Alias for "init-shared-repository", see "brz init-shared-repository".
1409 brz init-shared-repository LOCATION
1411 Options:
1412 --format ARG Specify a format for this repository.
1413 See "brz help formats" for details.
1414 --2a Format for the bzr 2.0 series.
1415 --bzr Format for the bzr 2.0 series.
1416 --default Format for the bzr 2.0 series.
1417 --git GIT repository.
1418 --git-bare Bare GIT repository (no working tree).
1419 --help, -h Show help message.
1420 --no-trees Branches in the repository will default
1421 to not having a working tree.
1422 --quiet, -q Only display errors and warnings.
1423 --usage Show usage message and options.
1424 --verbose, -v Display more information.
1425 Aliases: init-shared-repo, init-repo
1427 See also: branch, checkout, init, repositories
1429 Create a shared repository for branches to share storage space.
1431 New branches created under the repository directory will store their
1433 revisions in the repository, not in the branch directory. For branches
1434 with shared history, this reduces the amount of storage needed and
1435 speeds up the creation of new branches.
1436 If the --no-trees option is given then the branches in the repository
1438 will not have working trees by default. They will still exist as di‐
1439 rectories on disk, but they will not have separate copies of the files
1440 at a certain revision. This can be useful for repositories that store
1441 branches which are interacted with through checkouts or remote
1442 branches, such as on a server.
1443 Examples:
1445 Create a shared repository holding just branches:
1446 brz init-shared-repo --no-trees repo
1448 brz init repo/trunk
1449 Make a lightweight checkout elsewhere:
1451 brz checkout --lightweight repo/trunk trunk-checkout
1453 cd trunk-checkout
1454 (add files here)
1455 brz join TREE
1458 Options:
1459 --help, -h Show help message.
1460 --quiet, -q Only display errors and warnings.
1461 --usage Show usage message and options.
1462 --verbose, -v Display more information.
1463 See also: split
1465 Combine a tree into its containing tree.
1467 This command requires the target tree to be in a rich-root format.
1469 The TREE argument should be an independent tree, inside another tree,
1471 but not part of it. (Such trees can be produced by "brz split", but
1472 also by running "brz branch" with the target inside a tree.)
1473 The result is a combined tree, with the subtree no longer an indepen‐
1475 dent part. This is marked as a merge of the subtree into the contain‐
1476 ing tree, and all history is preserved.
1477 brz launchpad-login [NAME]
1480 Options:
1481 --help, -h Show help message.
1482 --no-check Don't check that the user name is valid.
1483 --quiet, -q Only display errors and warnings.
1484 --service-root ARG Launchpad service root to connect to
1485 --usage Show usage message and options.
1486 --verbose, -v Display more information.
1487 Alias: lp-login
1489 Show or set the Launchpad user ID.
1491 When communicating with Launchpad, some commands need to know your
1493 Launchpad user ID. This command can be used to set or show the user ID
1494 that Bazaar will use for such communication.
1495 Examples:
1497 Show the Launchpad ID of the current user:
1498 brz launchpad-login
1500 Set the Launchpad ID of the current user to 'bob':
1502 brz launchpad-login bob
1504 brz launchpad-logout
1507 Options:
1508 --help, -h Show help message.
1509 --quiet, -q Only display errors and warnings.
1510 --usage Show usage message and options.
1511 --verbose, -v Display more information.
1512 Alias: lp-logout
1514 Unset the Launchpad user ID.
1516 When communicating with Launchpad, some commands need to know your
1518 Launchpad user ID. This command will log you out from Launchpad. This
1519 means that communication with Launchpad will happen over HTTPS, and
1520 will not require one of your SSH keys to be available.
1521 brz launchpad-open [LOCATION]
1524 Options:
1525 --dry-run Do not actually open the browser. Just
1526 say the URL we would use.
1527 --help, -h Show help message.
1528 --quiet, -q Only display errors and warnings.
1529 --usage Show usage message and options.
1530 --verbose, -v Display more information.
1531 Alias: lp-open
1533 Open a Launchpad branch page in your web browser.
1535 brz link-tree LOCATION
1538 Options:
1539 --help, -h Show help message.
1540 --quiet, -q Only display errors and warnings.
1541 --usage Show usage message and options.
1542 --verbose, -v Display more information.
1543 Hardlink matching files to another tree.
1545 Only files with identical content and execute bit will be linked.
1547 brz log [FILE...]
1550 Options:
1551 --authors ARG What names to list as authors - first,
1552 all or committer.
1553 --change ARG, -c Show just the specified revision. See
1554 also "help revisionspec".
1555 --exclude-common-ancestry Display only the revisions that are not
1556 part of both ancestries (require
1557 -rX..Y).
1558 --forward Show from oldest to newest.
1559 --help, -h Show help message.
1560 --include-merged Show merged revisions like --levels 0
1561 does.
1562 --levels N, -n Number of levels to display - 0 for all,
1563 1 for flat.
1564 --limit N, -l Limit the output to the first N
1565 revisions.
1566 --log-format ARG Use specified log format.
1567 --gnu-changelog Format used by GNU ChangeLog files.
1568 --line Log format with one line per revision.
1569 --long Detailed log format.
1570 --short Moderately short log format.
1571 --match ARG, -m Show revisions whose properties match
1572 this expression.
1573 --match-author ARG Show revisions whose authors match this
1574 expression.
1575 --match-bugs ARG Show revisions whose bugs match this
1576 expression.
1577 --match-committer ARG Show revisions whose committer matches
1578 this expression.
1579 --match-message ARG Show revisions whose message matches
1580 this expression.
1581 --omit-merges Do not report commits with more than one
1582 parent.
1583 --quiet, -q Only display errors and warnings.
1584 --revision ARG, -r See "help revisionspec" for details.
1585 --show-diff, -p Show changes made in each revision as a
1586 patch.
1587 --show-ids Show internal object ids.
1588 --signatures Show digital signature validity.
1589 --timezone ARG Display timezone as local, original, or
1590 utc.
1591 --usage Show usage message and options.
1592 --verbose, -v Show files changed in each revision.
1593 See also: log-formats, revisionspec
1595 Show historical log for a branch or subset of a branch.
1597 log is brz's default tool for exploring the history of a branch. The
1599 branch to use is taken from the first parameter. If no parameters are
1600 given, the branch containing the working directory is logged. Here are
1601 some simple examples:
1602 brz log log the current branch
1604 brz log foo.py log a file in its branch
1605 brz log http://server/branch log a branch on a server
1606 The filtering, ordering and information shown for each revision can be
1608 controlled as explained below. By default, all revisions are shown
1609 sorted (topologically) so that newer revisions appear before older ones
1610 and descendants always appear before ancestors. If displayed, merged
1611 revisions are shown indented under the revision in which they were
1612 merged.
1613 Output control:
1615 The log format controls how information about each revision is
1617 displayed. The standard log formats are called \*(Aq\*(Aq‐
1618 long\*(Aq\*(Aq, \*(Aq\*(Aqshort\*(Aq\*(Aq
1619 and \*(Aq\*(Aqline\*(Aq\*(Aq. The default is long. See \*(Aq\*(Aqbrz
1620 help log-formats\*(Aq\*(Aq
1621 for more details on log formats.
1622 The following options can be used to control what information is
1624 displayed:
1625 -l N display a maximum of N revisions
1627 -n N display N levels of revisions (0 for all, 1 for col‐
1628 lapsed)
1629 -v display a status summary (delta) for each revision
1630 -p display a diff (patch) for each revision
1631 --show-ids display revision-ids (and file-ids), not just revnos
1632 Note that the default number of levels to display is a function of
1634 the
1635 log format. If the -n option is not used, the standard log formats
1636 show
1637 just the top level (mainline).
1638 Status summaries are shown using status flags like A, M, etc. To see
1640 the changes explained using words like \*(Aq\*(Aqadded\*(Aq\*(Aq and
1641 \*(Aq\*(Aqmodified\*(Aq\*(Aq
1642 instead, use the -vv option.
1643 Ordering control:
1645 To display revisions from oldest to newest, use the --forward option.
1647 In most cases, using this option will have little impact on the total
1648 time taken to produce a log, though --forward does not incrementally
1649 display revisions like --reverse does when it can.
1650 Revision filtering:
1652 The -r option can be used to specify what revision or range of revi‐
1654 sions
1655 to filter against. The various forms are shown below:
1656 -rX display revision X
1658 -rX.. display revision X and later
1659 -r..Y display up to and including revision Y
1660 -rX..Y display from X to Y inclusive
1661 See \*(Aq\*(Aqbrz help revisionspec\*(Aq\*(Aq for details on how to
1663 specify X and Y.
1664 Some common examples are given below:
1665 -r-1 show just the tip
1667 -r-10.. show the last 10 mainline revisions
1668 -rsubmit:.. show what's new on this branch
1669 -rancestor:path.. show changes since the common ancestor of this
1670 branch and the one at location path
1671 -rdate:yesterday.. show changes since yesterday
1672 When logging a range of revisions using -rX..Y, log starts at
1674 revision Y and searches back in history through the primary
1675 ("left-hand") parents until it finds X. When logging just the
1676 top level (using -n1), an error is reported if X is not found
1677 along the way. If multi-level logging is used (-n0), X may be
1678 a nested merge revision and the log will be truncated accordingly.
1679 Path filtering:
1681 If parameters are given and the first one is not a branch, the log
1683 will be filtered to show only those revisions that changed the
1684 nominated files or directories.
1685 Filenames are interpreted within their historical context. To log a
1687 deleted file, specify a revision range so that the file existed at
1688 the end or start of the range.
1689 Historical context is also important when interpreting pathnames of
1691 renamed files/directories. Consider the following example:
1692 * revision 1: add tutorial.txt
1694 * revision 2: modify tutorial.txt
1695 * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
1696 In this case:
1698 * \*(Aq\*(Aqbrz log guide.txt\*(Aq\*(Aq will log the file added in
1700 revision 1
1701 * \*(Aq\*(Aqbrz log tutorial.txt\*(Aq\*(Aq will log the new file
1703 added in revision 3
1704 * \*(Aq\*(Aqbrz log -r2 -p tutorial.txt\*(Aq\*(Aq will show the
1706 changes made to
1707 the original file in revision 2.
1708 * \*(Aq\*(Aqbrz log -r2 -p guide.txt\*(Aq\*(Aq will display an error
1710 message as there
1711 was no file called guide.txt in revision 2.
1712 Renames are always followed by log. By design, there is no need to
1714 explicitly ask for this (and no way to stop logging a file back
1715 until it was last renamed).
1716 Other filtering:
1718 The --match option can be used for finding revisions that match a
1720 regular expression in a commit message, committer, author or bug.
1721 Specifying the option several times will match any of the supplied
1722 expressions. --match-author, --match-bugs, --match-committer and
1723 --match-message can be used to only match a specific field.
1724 Tips & tricks:
1726 GUI tools and IDEs are often better at exploring history than command
1728 line tools: you may prefer qlog from qbzr, or the Loggerhead web
1729 interface. See the Breezy
1730 Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/> and
1731 <http://wiki.breezy-vcs.org/IDEIntegration>.
1732 You may find it useful to add the aliases below to
1734 \*(Aq\*(Aqbreezy.conf\*(Aq\*(Aq:
1735 [ALIASES]
1737 tip = log -r-1
1738 top = log -l10 --line
1739 show = log -v -p
1740 \*(Aq\*(Aqbrz tip\*(Aq\*(Aq will then show the latest revision while
1742 \*(Aq\*(Aqbrz top\*(Aq\*(Aq
1743 will show the last 10 mainline revisions. To see the details of a
1744 particular revision X, \*(Aq\*(Aqbrz show -rX\*(Aq\*(Aq.
1745 If you are interested in looking deeper into a particular merge X,
1747 use \*(Aq\*(Aqbrz log -n0 -rX\*(Aq\*(Aq.
1748 \*(Aq\*(Aqbrz log -v\*(Aq\*(Aq on a branch with lots of history is
1750 currently
1751 very slow. A fix for this issue is currently under development.
1752 With or without that fix, it is recommended that a revision range
1753 be given when using the -v option.
1754 brz has a generic full-text matching plugin, brz-search, that can be
1756 used to find revisions matching user names, commit messages, etc.
1757 Among other features, this plugin can find all revisions containing
1758 a list of words but not others.
1759 When exploring non-mainline history on large projects with deep
1761 history, the performance of log can be greatly improved by installing
1762 the historycache plugin. This plugin buffers historical information
1763 trading disk space for faster speed.
1764 brz lp-find-proposal
1767 Options:
1768 --help, -h Show help message.
1769 --quiet, -q Only display errors and warnings.
1770 --revision ARG, -r See "help revisionspec" for details.
1771 --usage Show usage message and options.
1772 --verbose, -v Display more information.
1773 Find the proposal to merge this revision.
1775 Finds the merge proposal(s) that discussed landing the specified revi‐
1777 sion. This works only if the if the merged_revno was recorded for the
1778 merge proposal. The proposal(s) are opened in a web browser.
1779 Only the revision specified is searched for. To find the mainline re‐
1781 vision that merged it into mainline, use the "mainline" revision spec.
1782 So, to find the merge proposal that reviewed line 1 of README:
1784 brz lp-find-proposal -r mainline:annotate:README:1
1786 brz lp-login
1789 Alias for "launchpad-login", see "brz launchpad-login".
1790 brz lp-logout
1792 Alias for "launchpad-logout", see "brz launchpad-logout".
1793 brz lp-open
1795 Alias for "launchpad-open", see "brz launchpad-open".
1796 brz ls [PATH]
1798 Options:
1799 --directory ARG, -d Branch to operate on, instead of working
1800 directory.
1801 --from-root Print paths relative to the root of the
1802 branch.
1803 --help, -h Show help message.
1804 --ignored, -i Print ignored files.
1805 --kind ARG, -k List entries of a particular kind: file,
1806 directory, symlink, tree-reference.
1807 --null, -0 Use an ASCII NUL (\0) separator rather
1808 than a newline.
1809 --quiet, -q Only display errors and warnings.
1810 --recursive, -R Recurse into subdirectories.
1811 --revision ARG, -r See "help revisionspec" for details.
1812 --show-ids Show internal object ids.
1813 --unknown, -u Print unknown files.
1814 --usage Show usage message and options.
1815 --verbose, -v Display more information.
1816 --versioned, -V Print versioned files.
1817 See also: cat, status
1819 List files in a tree.
1821 brz merge [LOCATION]
1825 Options:
1826 --change ARG, -c Select changes introduced by the
1827 specified revision. See also "help
1828 revisionspec".
1829 --directory ARG, -d Branch to merge into, rather than the
1830 one containing the working directory.
1831 --force Merge even if the destination tree has
1832 uncommitted changes.
1833 --help, -h Show help message.
1834 --interactive, -i Select changes interactively.
1835 --merge-type ARG Select a particular merge algorithm.
1836 --diff3 Merge using external diff3.
1837 --lca LCA-newness merge.
1838 --merge3 Native diff3-style merge.
1839 --weave Weave-based merge.
1840 --preview Instead of merging, show a diff of the
1841 merge.
1842 --pull If the destination is already completely
1843 merged into the source, pull from the
1844 source rather than merging. When this
1845 happens, you do not need to commit the
1846 result.
1847 --quiet, -q Only display errors and warnings.
1848 --remember Remember the specified location as a
1849 default.
1850 --reprocess Reprocess to reduce spurious conflicts.
1851 --revision ARG, -r See "help revisionspec" for details.
1852 --show-base Show base revision text in conflicts.
1853 --uncommitted Apply uncommitted changes from a working
1854 copy, instead of branch changes.
1855 --usage Show usage message and options.
1856 --verbose, -v Display more information.
1857 See also: remerge, send, status-flags, update
1859 Perform a three-way merge.
1861 The source of the merge can be specified either in the form of a
1863 branch, or in the form of a path to a file containing a merge directive
1864 generated with brz send. If neither is specified, the default is the
1865 upstream branch or the branch most recently merged using --remember.
1866 The source of the merge may also be specified in the form of a path to
1867 a file in another branch: in this case, only the modifications to that
1868 file are merged into the current working tree.
1869 When merging from a branch, by default brz will try to merge in all new
1871 work from the other branch, automatically determining an appropriate
1872 base revision. If this fails, you may need to give an explicit base.
1873 To pick a different ending revision, pass "--revision OTHER". brz will
1875 try to merge in all new work up to and including revision OTHER.
1876 If you specify two values, "--revision BASE..OTHER", only revisions
1878 BASE through OTHER, excluding BASE but including OTHER, will be merged.
1879 If this causes some revisions to be skipped, i.e. if the destination
1880 branch does not already contain revision BASE, such a merge is commonly
1881 referred to as a "cherrypick". Unlike a normal merge, Breezy does not
1882 currently track cherrypicks. The changes look like a normal commit, and
1883 the history of the changes from the other branch is not stored in the
1884 commit.
1885 Revision numbers are always relative to the source branch.
1887 Merge will do its best to combine the changes in two branches, but
1889 there are some kinds of problems only a human can fix. When it encoun‐
1890 ters those, it will mark a conflict. A conflict means that you need to
1891 fix something, before you can commit.
1892 Use brz resolve when you have fixed a problem. See also brz conflicts.
1894 If there is no default branch set, the first merge will set it (use
1896 --no-remember to avoid setting it). After that, you can omit the branch
1897 to use the default. To change the default, use --remember. The value
1898 will only be saved if the remote location can be accessed.
1899 The results of the merge are placed into the destination working direc‐
1901 tory, where they can be reviewed (with brz diff), tested, and then com‐
1902 mitted to record the result of the merge.
1903 merge refuses to run if there are any uncommitted changes, unless
1905 --force is given. If --force is given, then the changes from the
1906 source will be merged with the current working tree, including any un‐
1907 committed changes in the tree. The --force option can also be used to
1908 create a merge revision which has more than two parents.
1909 If one would like to merge changes from the working tree of the other
1911 branch without merging any committed revisions, the --uncommitted op‐
1912 tion can be given.
1913 To select only some changes to merge, use "merge -i", which will prompt
1915 you to apply each diff hunk and file change, similar to "shelve".
1916 Examples:
1918 To merge all new revisions from brz.dev:
1919 brz merge ../brz.dev
1921 To merge changes up to and including revision 82 from brz.dev:
1923 brz merge -r 82 ../brz.dev
1925 To merge the changes introduced by 82, without previous changes:
1927 brz merge -r 81..82 ../brz.dev
1929 To apply a merge directive contained in /tmp/merge:
1931 brz merge /tmp/merge
1933 To create a merge revision with three parents from two branches
1935 feature1a and feature1b:
1936 brz merge ../feature1a
1938 brz merge ../feature1b --force
1939 brz commit -m 'revision with three parents'
1940 brz missing [OTHER_BRANCH]
1943 Options:
1944 --directory ARG, -d Branch to operate on, instead of working
1945 directory.
1946 --help, -h Show help message.
1947 --include-merged Show all revisions in addition to the
1948 mainline ones.
1949 --log-format ARG Use specified log format.
1950 --gnu-changelog Format used by GNU ChangeLog files.
1951 --line Log format with one line per revision.
1952 --long Detailed log format.
1953 --short Moderately short log format.
1954 --mine-only Display changes in the local branch
1955 only.
1956 --my-revision ARG Filter on local branch revisions
1957 (inclusive). See "help revisionspec" for
1958 details.
1959 --other Same as --theirs-only.
1960 --quiet, -q Only display errors and warnings.
1961 --reverse Reverse the order of revisions.
1962 --revision ARG, -r Filter on other branch revisions
1963 (inclusive). See "help revisionspec" for
1964 details.
1965 --show-ids Show internal object ids.
1966 --theirs-only Display changes in the remote branch
1967 only.
1968 --this Same as --mine-only.
1969 --usage Show usage message and options.
1970 --verbose, -v Display more information.
1971 See also: merge, pull
1973 Show unmerged/unpulled revisions between two branches.
1975 OTHER_BRANCH may be local or remote.
1977 To filter on a range of revisions, you can use the command -r be‐
1979 gin..end -r revision requests a specific revision, -r ..end or -r be‐
1980 gin.. are also valid.
1981 Exit values:
1983 1 - some missing revisions
1984 0 - no missing revisions
1985 Examples:
1987 Determine the missing revisions between this and the branch at the
1989 remembered pull location:
1990 brz missing
1992 Determine the missing revisions between this and another branch:
1994 brz missing http://server/branch
1996 Determine the missing revisions up to a specific revision on the
1998 other
1999 branch:
2000 brz missing -r ..-10
2002 Determine the missing revisions up to a specific revision on this
2004 branch:
2005 brz missing --my-revision ..-10
2007 brz mkdir DIR...
2010 Options:
2011 --help, -h Show help message.
2012 --parents, -p No error if existing, make parent
2013 directories as needed.
2014 --quiet, -q Only display errors and warnings.
2015 --usage Show usage message and options.
2016 --verbose, -v Display more information.
2017 Create a new versioned directory.
2019 This is equivalent to creating the directory and then adding it.
2021 brz move
2024 Alias for "mv", see "brz mv".
2025 brz mv [NAMES...]
2027 Options:
2028 --after Move only the brz identifier of the
2029 file, because the file has already been
2030 moved.
2031 --auto Automatically guess renames.
2032 --dry-run Avoid making changes when guessing
2033 renames.
2034 --help, -h Show help message.
2035 --quiet, -q Only display errors and warnings.
2036 --usage Show usage message and options.
2037 --verbose, -v Display more information.
2038 Aliases: move, rename
2040 Move or rename a file.
2042 Usage:
2044 brz mv OLDNAME NEWNAME
2045 brz mv SOURCE... DESTINATION
2047 If the last argument is a versioned directory, all the other names are
2049 moved into it. Otherwise, there must be exactly two arguments and the
2050 file is changed to a new name.
2051 If OLDNAME does not exist on the filesystem but is versioned and NEW‐
2053 NAME does exist on the filesystem but is not versioned, mv assumes that
2054 the file has been manually moved and only updates its internal inven‐
2055 tory to reflect that change. The same is valid when moving many SOURCE
2056 files to a DESTINATION.
2057 Files cannot be moved between branches.
2059 brz nick [NICKNAME]
2062 Options:
2063 --directory ARG, -d Branch to operate on, instead of working
2064 directory.
2065 --help, -h Show help message.
2066 --quiet, -q Only display errors and warnings.
2067 --usage Show usage message and options.
2068 --verbose, -v Display more information.
2069 See also: info
2071 Print or set the branch nickname.
2073 If unset, the colocated branch name is used for colocated branches, and
2075 the branch directory name is used for other branches. To print the
2076 current nickname, execute with no argument.
2077 Bound branches use the nickname of its master branch unless it is set
2079 locally.
2080 brz pack [BRANCH_OR_REPO]
2083 Options:
2084 --clean-obsolete-packs Delete obsolete packs to save disk
2085 space.
2086 --help, -h Show help message.
2087 --quiet, -q Only display errors and warnings.
2088 --usage Show usage message and options.
2089 --verbose, -v Display more information.
2090 See also: repositories
2092 Compress the data within a repository.
2094 This operation compresses the data within a bazaar repository. As
2096 bazaar supports automatic packing of repository, this operation is nor‐
2097 mally not required to be done manually.
2098 During the pack operation, bazaar takes a backup of existing repository
2100 data, i.e. pack files. This backup is eventually removed by bazaar au‐
2101 tomatically when it is safe to do so. To save disk space by removing
2102 the backed up pack files, the --clean-obsolete-packs option may be
2103 used.
2104 Warning: If you use --clean-obsolete-packs and your machine crashes
2106 during or immediately after repacking, you may be left with a state
2107 where the deletion has been written to disk but the new packs have not
2108 been. In this case the repository may be unusable.
2109 brz patch [FILENAME]
2112 Options:
2113 --help, -h Show help message.
2114 --quiet, -q Only display errors and warnings.
2115 --silent Suppress chatter.
2116 --strip ARG, -p Strip the smallest prefix containing num
2117 leading slashes from filenames.
2118 --usage Show usage message and options.
2119 --verbose, -v Display more information.
2120 Apply a named patch to the current tree.
2122 brz ping LOCATION
2127 Options:
2128 --help, -h Show help message.
2129 --quiet, -q Only display errors and warnings.
2130 --usage Show usage message and options.
2131 --verbose, -v Display more information.
2132 Pings a Bazaar smart server.
2134 This command sends a 'hello' request to the given location using the
2136 brz smart protocol, and reports the response.
2137 brz plugins
2140 Options:
2141 --help, -h Show help message.
2142 --quiet, -q Only display errors and warnings.
2143 --usage Show usage message and options.
2144 --verbose, -v Display more information.
2145 List the installed plugins.
2147 This command displays the list of installed plugins including version
2149 of plugin and a short description of each.
2150 --verbose shows the path where each plugin is located.
2152 A plugin is an external component for Breezy that extends the revision
2154 control system, by adding or replacing code in Breezy. Plugins can do
2155 a variety of things, including overriding commands, adding new com‐
2156 mands, providing additional network transports and customizing log out‐
2157 put.
2158 See the Breezy Plugin Guide <https://www.breezy-vcs.org/doc/plug‐
2160 ins/en/> for further information on plugins including where to find
2161 them and how to install them. Instructions are also provided there on
2162 how to write new plugins using the Python programming language.
2163 brz praise
2166 Alias for "annotate", see "brz annotate".
2167 brz pull [LOCATION]
2169 Options:
2170 --directory ARG, -d Branch to pull into, rather than the one
2171 containing the working directory.
2172 --help, -h Show help message.
2173 --local Perform a local pull in a bound branch.
2174 Local pulls are not applied to the
2175 master branch.
2176 --overwrite Ignore differences between branches and
2177 overwrite unconditionally.
2178 --overwrite-tags Overwrite tags only.
2179 --quiet, -q Only display errors and warnings.
2180 --remember Remember the specified location as a
2181 default.
2182 --revision ARG, -r See "help revisionspec" for details.
2183 --show-base Show base revision text in conflicts.
2184 --usage Show usage message and options.
2185 --verbose, -v Show logs of pulled revisions.
2186 See also: push, send, status-flags, update
2188 Turn this branch into a mirror of another branch.
2190 By default, this command only works on branches that have not diverged.
2192 Branches are considered diverged if the destination branch's most re‐
2193 cent commit is one that has not been merged (directly or indirectly)
2194 into the parent.
2195 If branches have diverged, you can use 'brz merge' to integrate the
2197 changes from one into the other. Once one branch has merged, the other
2198 should be able to pull it again.
2199 If you want to replace your local changes and just want your branch to
2201 match the remote one, use pull --overwrite. This will work even if the
2202 two branches have diverged.
2203 If there is no default location set, the first pull will set it (use
2205 --no-remember to avoid setting it). After that, you can omit the loca‐
2206 tion to use the default. To change the default, use --remember. The
2207 value will only be saved if the remote location can be accessed.
2208 The --verbose option will display the revisions pulled using the
2210 log_format configuration option. You can use a different format by
2211 overriding it with -Olog_format=<other_format>.
2212 Note: The location can be specified either in the form of a branch, or
2214 in the form of a path to a file containing a merge directive generated
2215 with brz send.
2216 brz push [LOCATION]
2219 Options:
2220 --create-prefix Create the path leading up to the branch
2221 if it does not already exist.
2222 --directory ARG, -d Branch to push from, rather than the one
2223 containing the working directory.
2224 --help, -h Show help message.
2225 --lossy Allow lossy push, i.e. dropping metadata
2226 that can't be represented in the target.
2227 --no-tree Don't populate the working tree, even
2228 for protocols that support it.
2229 --overwrite Ignore differences between branches and
2230 overwrite unconditionally.
2231 --overwrite-tags Overwrite tags only.
2232 --quiet, -q Only display errors and warnings.
2233 --remember Remember the specified location as a
2234 default.
2235 --revision ARG, -r See "help revisionspec" for details.
2236 --stacked Create a stacked branch that references
2237 the public location of the parent
2238 branch.
2239 --stacked-on ARG Create a stacked branch that refers to
2240 another branch for the commit history.
2241 Only the work not present in the
2242 referenced branch is included in the
2243 branch created.
2244 --strict Refuse to push if there are uncommitted
2245 changes in the working tree, --no-strict
2246 disables the check.
2247 --usage Show usage message and options.
2248 --use-existing-dir By default push will fail if the target
2249 directory exists, but does not already
2250 have a control directory. This flag
2251 will allow push to proceed.
2252 --verbose, -v Display more information.
2253 See also: pull, update, working-trees
2255 Update a mirror of this branch.
2257 The target branch will not have its working tree populated because this
2259 is both expensive, and is not supported on remote file systems.
2260 Some smart servers or protocols *may* put the working tree in place in
2262 the future.
2263 This command only works on branches that have not diverged. Branches
2265 are considered diverged if the destination branch's most recent commit
2266 is one that has not been merged (directly or indirectly) by the source
2267 branch.
2268 If branches have diverged, you can use 'brz push --overwrite' to re‐
2270 place the other branch completely, discarding its unmerged changes.
2271 If you want to ensure you have the different changes in the other
2273 branch, do a merge (see brz help merge) from the other branch, and com‐
2274 mit that. After that you will be able to do a push without '--over‐
2275 write'.
2276 If there is no default push location set, the first push will set it
2278 (use --no-remember to avoid setting it). After that, you can omit the
2279 location to use the default. To change the default, use --remember.
2280 The value will only be saved if the remote location can be accessed.
2281 The --verbose option will display the revisions pushed using the
2283 log_format configuration option. You can use a different format by
2284 overriding it with -Olog_format=<other_format>.
2285 brz reconcile [BRANCH]
2288 Options:
2289 --help, -h Show help message.
2290 --quiet, -q Only display errors and warnings.
2291 --usage Show usage message and options.
2292 --verbose, -v Display more information.
2293 See also: check
2295 Reconcile brz metadata in a branch.
2297 This can correct data mismatches that may have been caused by previous
2299 ghost operations or brz upgrades. You should only need to run this com‐
2300 mand if 'brz check' or a brz developer advises you to run it.
2301 If a second branch is provided, cross-branch reconciliation is also at‐
2303 tempted, which will check that data like the tree root id which was not
2304 present in very early brz versions is represented correctly in both
2305 branches.
2306 At the same time it is run it may recompress data resulting in a poten‐
2308 tial saving in disk space or performance gain.
2309 The branch *MUST* be on a listable system such as local disk or sftp.
2311 brz reconfigure [LOCATION]
2314 Options:
2315 --bind-to ARG Branch to bind checkout to.
2316 --force Perform reconfiguration even if local
2317 changes will be lost.
2318 --help, -h Show help message.
2319 --quiet, -q Only display errors and warnings.
2320 --repository_trees ARG Whether new branches in the repository
2321 have trees.
2322 --with-no-trees Reconfigure repository to not create
2323 working trees on branches by default.
2324 --with-trees Reconfigure repository to create working
2325 trees on branches by default.
2326 --repository_type ARG Location fo the repository.
2327 --standalone Reconfigure to be a standalone branch
2328 (i.e. stop using shared repository).
2329 --use-shared Reconfigure to use a shared repository.
2330 --stacked-on ARG Reconfigure a branch to be stacked on
2331 another branch.
2332 --tree_type ARG The relation between branch and tree.
2333 --branch Reconfigure to be an unbound branch with
2334 no working tree.
2335 --checkout Reconfigure to be a bound branch with a
2336 working tree.
2337 --lightweight-checkout Reconfigure to be a lightweight checkout
2338 (with no local history).
2339 --tree Reconfigure to be an unbound branch with
2340 a working tree.
2341 --unstacked Reconfigure a branch to be unstacked.
2342 This may require copying substantial
2343 data into it.
2344 --usage Show usage message and options.
2345 --verbose, -v Display more information.
2346 See also: branches, checkouts, standalone-trees, working-trees
2348 Reconfigure the type of a brz directory.
2350 A target configuration must be specified.
2352 For checkouts, the bind-to location will be auto-detected if not speci‐
2354 fied. The order of preference is 1. For a lightweight checkout, the
2355 current bound location. 2. For branches that used to be checkouts, the
2356 previously-bound location. 3. The push location. 4. The parent loca‐
2357 tion. If none of these is available, --bind-to must be specified.
2358 brz remerge [FILE...]
2361 Options:
2362 --help, -h Show help message.
2363 --merge-type ARG Select a particular merge algorithm.
2364 --diff3 Merge using external diff3.
2365 --lca LCA-newness merge.
2366 --merge3 Native diff3-style merge.
2367 --weave Weave-based merge.
2368 --quiet, -q Only display errors and warnings.
2369 --reprocess Reprocess to reduce spurious conflicts.
2370 --show-base Show base revision text in conflicts.
2371 --usage Show usage message and options.
2372 --verbose, -v Display more information.
2373 Redo a merge.
2375 Use this if you want to try a different merge technique while resolving
2377 conflicts. Some merge techniques are better than others, and remerge
2378 lets you try different ones on different files.
2379 The options for remerge have the same meaning and defaults as the ones
2381 for merge. The difference is that remerge can (only) be run when there
2382 is a pending merge, and it lets you specify particular files.
2383 Examples:
2385 Re-do the merge of all conflicted files, and show the base text in
2386 conflict regions, in addition to the usual THIS and OTHER texts:
2387 brz remerge --show-base
2389 Re-do the merge of "foobar", using the weave merge algorithm, with
2391 additional processing to reduce the size of conflict regions:
2392 brz remerge --merge-type weave --reprocess foobar
2394 brz remove [FILE...]
2397 Options:
2398 --file-deletion-strategy ARGThe file deletion mode to be used.
2399 --keep Delete from brz but leave the working
2400 copy.
2401 --no-backup Don't backup changed files.
2402 --safe Backup changed files (default).
2403 --help, -h Show help message.
2404 --new Only remove files that have never been
2405 committed.
2406 --quiet, -q Only display errors and warnings.
2407 --usage Show usage message and options.
2408 --verbose, -v Display more information.
2409 Aliases: rm, del
2411 Remove files or directories.
2413 This makes Breezy stop tracking changes to the specified files. Breezy
2415 will delete them if they can easily be recovered using revert otherwise
2416 they will be backed up (adding an extension of the form .~#~). If no
2417 options or parameters are given Breezy will scan for files that are be‐
2418 ing tracked by Breezy but missing in your tree and stop tracking them
2419 for you.
2420 brz remove-branch [LOCATION]
2423 Options:
2424 --directory ARG, -d Branch to operate on, instead of working
2425 directory.
2426 --force Remove branch even if it is the active
2427 branch.
2428 --help, -h Show help message.
2429 --quiet, -q Only display errors and warnings.
2430 --usage Show usage message and options.
2431 --verbose, -v Display more information.
2432 Alias: rmbranch
2434 Remove a branch.
2436 This will remove the branch from the specified location but will keep
2438 any working tree or repository in place.
2439 Examples:
2441 Remove the branch at repo/trunk:
2443 brz remove-branch repo/trunk
2445 brz remove-tree [LOCATION...]
2448 Options:
2449 --force Remove the working tree even if it has
2450 uncommitted or shelved changes.
2451 --help, -h Show help message.
2452 --quiet, -q Only display errors and warnings.
2453 --usage Show usage message and options.
2454 --verbose, -v Display more information.
2455 See also: checkout, working-trees
2457 Remove the working tree from a given branch/checkout.
2459 Since a lightweight checkout is little more than a working tree this
2461 will refuse to run against one.
2462 To re-create the working tree, use "brz checkout".
2464 brz rename
2467 Alias for "mv", see "brz mv".
2468 brz renames [DIR]
2470 Options:
2471 --help, -h Show help message.
2472 --quiet, -q Only display errors and warnings.
2473 --usage Show usage message and options.
2474 --verbose, -v Display more information.
2475 See also: status
2477 Show list of renamed files.
2479 brz resolve [FILE...]
2483 Options:
2484 --action ARG How to resolve the conflict.
2485 --auto Detect whether conflict has been
2486 resolved by user.
2487 --done Marks the conflict as resolved.
2488 --take-other Resolve the conflict taking the merged
2489 version into account.
2490 --take-this Resolve the conflict preserving the
2491 version in the working tree.
2492 --all Resolve all conflicts in this tree.
2493 --directory ARG, -d Branch to operate on, instead of working
2494 directory.
2495 --help, -h Show help message.
2496 --quiet, -q Only display errors and warnings.
2497 --usage Show usage message and options.
2498 --verbose, -v Display more information.
2499 Alias: resolved
2501 See also: conflicts
2503 Mark a conflict as resolved.
2505 Merge will do its best to combine the changes in two branches, but
2507 there are some kinds of problems only a human can fix. When it encoun‐
2508 ters those, it will mark a conflict. A conflict means that you need to
2509 fix something, before you can commit.
2510 Once you have fixed a problem, use "brz resolve" to automatically mark
2512 text conflicts as fixed, "brz resolve FILE" to mark a specific conflict
2513 as resolved, or "brz resolve --all" to mark all conflicts as resolved.
2514 brz resolved
2517 Alias for "resolve", see "brz resolve".
2518 brz revert [FILE...]
2520 Options:
2521 --forget-merges Remove pending merge marker, without
2522 changing any files.
2523 --help, -h Show help message.
2524 --no-backup Do not save backups of reverted files.
2525 --quiet, -q Only display errors and warnings.
2526 --revision ARG, -r See "help revisionspec" for details.
2527 --usage Show usage message and options.
2528 --verbose, -v Display more information.
2529 See also: cat, export, merge, shelve
2531 Set files in the working tree back to the contents of a previous revi‐
2533 sion.
2534 Giving a list of files will revert only those files. Otherwise, all
2536 files will be reverted. If the revision is not specified with '--revi‐
2537 sion', the working tree basis revision is used. A revert operation af‐
2538 fects only the working tree, not any revision history like the branch
2539 and repository or the working tree basis revision.
2540 To remove only some changes, without reverting to a prior version, use
2542 merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
2543 will remove the changes introduced by the second last commit (-2),
2544 without affecting the changes introduced by the last commit (-1). To
2545 remove certain changes on a hunk-by-hunk basis, see the shelve command.
2546 To update the branch to a specific revision or the latest revision and
2547 update the working tree accordingly while preserving local changes, see
2548 the update command.
2549 Uncommitted changes to files that are reverted will be discarded. How‐
2551 ever, by default, any files that have been manually changed will be
2552 backed up first. (Files changed only by merge are not backed up.)
2553 Backup files have '.~#~' appended to their name, where # is a number.
2554 When you provide files, you can use their current pathname or the path‐
2556 name from the target revision. So you can use revert to "undelete" a
2557 file by name. If you name a directory, all the contents of that direc‐
2558 tory will be reverted.
2559 If you have newly added files since the target revision, they will be
2561 removed. If the files to be removed have been changed, backups will be
2562 created as above. Directories containing unknown files will not be
2563 deleted.
2564 The working tree contains a list of revisions that have been merged but
2566 not yet committed. These revisions will be included as additional par‐
2567 ents of the next commit. Normally, using revert clears that list as
2568 well as reverting the files. If any files are specified, revert leaves
2569 the list of uncommitted merges alone and reverts only the files. Use
2570 \*(Aq\*(Aqbrz revert.\*(Aq\*(Aq in the tree root to revert all files
2571 but keep the recorded merges, and \*(Aq\*(Aqbrz revert --for‐
2572 get-merges\*(Aq\*(Aq to clear the pending merge list without reverting
2573 any files.
2574 Using "brz revert --forget-merges", it is possible to apply all of the
2576 changes from a branch in a single revision. To do this, perform the
2577 merge as desired. Then doing revert with the "--forget-merges" option
2578 will keep the content of the tree as it was, but it will clear the list
2579 of pending merges. The next commit will then contain all of the
2580 changes that are present in the other branch, but without any other
2581 parent revisions. Because this technique forgets where these changes
2582 originated, it may cause additional conflicts on later merges involving
2583 the same source and target branches.
2584 brz revno [LOCATION]
2587 Options:
2588 --help, -h Show help message.
2589 --quiet, -q Only display errors and warnings.
2590 --revision ARG, -r See "help revisionspec" for details.
2591 --tree Show revno of working tree.
2592 --usage Show usage message and options.
2593 --verbose, -v Display more information.
2594 See also: info
2596 Show current revision number.
2598 This is equal to the number of revisions on this branch.
2600 brz rm
2603 Alias for "remove", see "brz remove".
2604 brz rmbranch
2606 Alias for "remove-branch", see "brz remove-branch".
2607 brz root [FILENAME]
2609 Options:
2610 --help, -h Show help message.
2611 --quiet, -q Only display errors and warnings.
2612 --usage Show usage message and options.
2613 --verbose, -v Display more information.
2614 Show the tree root directory.
2616 The root is the nearest enclosing directory with a control directory.
2618 brz send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
2621 Options:
2622 --body ARG Body for the email.
2623 --format ARG Use the specified output format.
2624 --from ARG, -f Branch to generate the submission from,
2625 rather than the one containing the
2626 working directory.
2627 --help, -h Show help message.
2628 --mail-to ARG Mail the request to this address.
2629 --message ARG, -m Message string.
2630 --no-bundle Do not include a bundle in the merge
2631 directive.
2632 --no-patch Do not include a preview patch in the
2633 merge directive.
2634 --output ARG, -o Write merge directive to this file or
2635 directory; use - for stdout.
2636 --quiet, -q Only display errors and warnings.
2637 --remember Remember submit and public branch.
2638 --revision ARG, -r See "help revisionspec" for details.
2639 --strict Refuse to send if there are uncommitted
2640 changes in the working tree, --no-strict
2641 disables the check.
2642 --usage Show usage message and options.
2643 --verbose, -v Display more information.
2644 See also: merge, pull
2646 Mail or create a merge-directive for submitting changes.
2648 A merge directive provides many things needed for requesting merges:
2650 * A machine-readable description of the merge to perform
2652 * An optional patch that is a preview of the changes requested
2654 * An optional bundle of revision data, so that the changes can be ap‐
2656 plied
2657 directly from the merge directive, without retrieving data from a
2658 branch.
2659 \*(Aqbrz send\*(Aq creates a compact data set that, when applied using
2661 brz merge, has the same effect as merging from the source branch.
2662 By default the merge directive is self-contained and can be applied to
2664 any branch containing submit_branch in its ancestory without needing
2665 access to the source branch.
2666 If --no-bundle is specified, then Breezy doesn't send the contents of
2668 the revisions, but only a structured request to merge from the pub‐
2669 lic_location. In that case the public_branch is needed and it must be
2670 up-to-date and accessible to the recipient. The public_branch is al‐
2671 ways included if known, so that people can check it later.
2672 The submit branch defaults to the parent of the source branch, but can
2674 be overridden. Both submit branch and public branch will be remembered
2675 in branch.conf the first time they are used for a particular branch.
2676 The source branch defaults to that containing the working directory,
2677 but can be changed using --from.
2678 Both the submit branch and the public branch follow the usual behavior
2680 with respect to --remember: If there is no default location set, the
2681 first send will set it (use --no-remember to avoid setting it). After
2682 that, you can omit the location to use the default. To change the de‐
2683 fault, use --remember. The value will only be saved if the location can
2684 be accessed.
2685 In order to calculate those changes, brz must analyse the submit
2687 branch. Therefore it is most efficient for the submit branch to be a
2688 local mirror. If a public location is known for the submit_branch,
2689 that location is used in the merge directive.
2690 The default behaviour is to send the merge directive by mail, unless -o
2692 is given, in which case it is sent to a file.
2693 Mail is sent using your preferred mail program. This should be trans‐
2695 parent on Windows (it uses MAPI). On Unix, it requires the xdg-email
2696 utility. If the preferred client can't be found (or used), your editor
2697 will be used.
2698 To use a specific mail program, set the mail_client configuration op‐
2700 tion. Supported values for specific clients are "claws", "evolution",
2701 "kmail", "mail.app" (MacOS X's Mail.app), "mutt", and "thunderbird";
2702 generic options are "default", "editor", "emacsclient", "mapi", and
2703 "xdg-email". Plugins may also add supported clients.
2704 If mail is being sent, a to address is required. This can be supplied
2706 either on the commandline, by setting the submit_to configuration op‐
2707 tion in the branch itself or the child_submit_to configuration option
2708 in the submit branch.
2709 The merge directives created by brz send may be applied using brz merge
2711 or brz pull by specifying a file containing a merge directive as the
2712 location.
2713 brz send makes extensive use of public locations to map local locations
2715 into URLs that can be used by other people. See \*(Aqbrz help configu‐
2716 ration\*(Aq to set them, and use \*(Aqbrz info\*(Aq to display them.
2717 brz serve
2720 Options:
2721 --allow-writes By default the server is a readonly
2722 server. Supplying --allow-writes
2723 enables write access to the contents of
2724 the served directory and below. Note
2725 that \*(Aq\*(Aqbrz serve\*(Aq\*(Aq does
2726 not perform
2727 authentication, so unless some form of
2728 external authentication is arranged
2729 supplying this option leads to global
2730 uncontrolled write access to your file
2731 system.
2732 --client-timeout ARG Override the default idle client timeout
2733 (5min).
2734 --directory ARG, -d Serve contents of this directory.
2735 --help, -h Show help message.
2736 --inet Serve on stdin/out for use from inetd or
2737 sshd.
2738 --listen ARG Listen for connections on nominated
2739 address.
2740 --port ARG Listen for connections on nominated
2741 port. Passing 0 as the port number will
2742 result in a dynamically allocated port.
2743 The default port depends on the
2744 protocol.
2745 --protocol ARG Protocol to serve.
2746 --bzr The Bazaar smart server protocol over
2747 TCP. (default port: 4155)
2748 --git Git Smart server protocol over TCP.
2749 (default port: 9418)
2750 --git-receive-pack Git Smart server receive pack command.
2751 (inetd mode only)
2752 --git-upload-pack Git Smart server upload pack command.
2753 (inetd mode only)
2754 --quiet, -q Only display errors and warnings.
2755 --usage Show usage message and options.
2756 --verbose, -v Display more information.
2757 Alias: server
2759 Run the brz server.
2761 brz server
2764 Alias for "serve", see "brz serve".
2765 brz shelve [FILE...]
2767 Options:
2768 --all Shelve all changes.
2769 --destroy Destroy removed changes instead of
2770 shelving them.
2771 --directory ARG, -d Branch to operate on, instead of working
2772 directory.
2773 --help, -h Show help message.
2774 --list List shelved changes.
2775 --message ARG, -m Message string.
2776 --quiet, -q Only display errors and warnings.
2777 --revision ARG, -r See "help revisionspec" for details.
2778 --usage Show usage message and options.
2779 --verbose, -v Display more information.
2780 --writer ARG Method to use for writing diffs.
2781 --plain Plaintext diff output.
2782 See also: configuration, unshelve
2784 Temporarily set aside some changes from the current tree.
2786 Shelve allows you to temporarily put changes you've made "on the
2788 shelf", ie. out of the way, until a later time when you can bring them
2789 back from the shelf with the 'unshelve' command. The changes are
2790 stored alongside your working tree, and so they aren't propagated along
2791 with your branch nor will they survive its deletion.
2792 If shelve --list is specified, previously-shelved changes are listed.
2794 Shelve is intended to help separate several sets of changes that have
2796 been inappropriately mingled. If you just want to get rid of all
2797 changes and you don't need to restore them later, use revert. If you
2798 want to shelve all text changes at once, use shelve --all.
2799 If filenames are specified, only the changes to those files will be
2801 shelved. Other files will be left untouched.
2802 If a revision is specified, changes since that revision will be
2804 shelved.
2805 You can put multiple items on the shelf, and by default, 'unshelve'
2807 will restore the most recently shelved changes.
2808 For complicated changes, it is possible to edit the changes in a sepa‐
2810 rate editor program to decide what the file remaining in the working
2811 copy should look like. To do this, add the configuration option
2812 change_editor = PROGRAM {new_path} {old_path}
2814 where {new_path} is replaced with the path of the new version of the
2816 file and {old_path} is replaced with the path of the old version of the
2817 file. The PROGRAM should save the new file with the desired contents
2818 of the file in the working tree.
2819 brz sign-my-commits [LOCATION] [COMMITTER]
2822 Options:
2823 --dry-run Don't actually sign anything, just print
2824 the revisions that would be signed.
2825 --help, -h Show help message.
2826 --quiet, -q Only display errors and warnings.
2827 --usage Show usage message and options.
2828 --verbose, -v Display more information.
2829 Sign all commits by a given committer.
2831 If location is not specified the local tree is used. If committer is
2833 not specified the default committer is used.
2834 This does not sign commits that already have signatures.
2836 brz split TREE
2839 Options:
2840 --help, -h Show help message.
2841 --quiet, -q Only display errors and warnings.
2842 --usage Show usage message and options.
2843 --verbose, -v Display more information.
2844 See also: join
2846 Split a subdirectory of a tree into a separate tree.
2848 This command will produce a target tree in a format that supports rich
2850 roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
2851 converted into earlier formats like 'dirstate-tags'.
2852 The TREE argument should be a subdirectory of a working tree. That
2854 subdirectory will be converted into an independent tree, with its own
2855 branch. Commits in the top-level tree will not apply to the new sub‐
2856 tree.
2857 brz st
2860 Alias for "status", see "brz status".
2861 brz stat
2863 Alias for "status", see "brz status".
2864 brz status [FILE...]
2866 Options:
2867 --change ARG, -c Select changes introduced by the
2868 specified revision. See also "help
2869 revisionspec".
2870 --help, -h Show help message.
2871 --no-classify Do not mark object type using indicator.
2872 --no-pending Don't show pending merges.
2873 --quiet, -q Only display errors and warnings.
2874 --revision ARG, -r See "help revisionspec" for details.
2875 --short, -S Use short status indicators.
2876 --show-ids Show internal object ids.
2877 --usage Show usage message and options.
2878 --verbose, -v Display more information.
2879 --versioned, -V Only show versioned files.
2880 Aliases: st, stat
2882 See also: diff, revert, status-flags
2884 Display status summary.
2886 This reports on versioned and unknown files, reporting them grouped by
2888 state. Possible states are:
2889 added
2891 Versioned in the working copy but not in the previous revision.
2892 removed
2894 Versioned in the previous revision but removed or deleted
2895 in the working copy.
2896 renamed
2898 Path of this file changed from the previous revision;
2899 the text may also have changed. This includes files whose
2900 parent directory was renamed.
2901 modified
2903 Text has changed since the previous revision.
2904 kind changed
2906 File kind has been changed (e.g. from file to directory).
2907 unknown
2909 Not versioned and not matching an ignore pattern.
2910 Additionally for directories, symlinks and files with a changed exe‐
2912 cutable bit, Breezy indicates their type using a trailing character:
2913 '/', '@' or '*' respectively. These decorations can be disabled using
2914 the '--no-classify' option.
2915 To see ignored files use 'brz ignored'. For details on the changes to
2917 file texts, use 'brz diff'.
2918 Note that --short or -S gives status flags for each item, similar to
2920 Subversion's status command. To get output similar to svn -q, use brz
2921 status -SV.
2922 If no arguments are specified, the status of the entire working direc‐
2924 tory is shown. Otherwise, only the status of the specified files or
2925 directories is reported. If a directory is given, status is reported
2926 for everything inside that directory.
2927 Before merges are committed, the pending merge tip revisions are shown.
2929 To see all pending merge revisions, use the -v option. To skip the
2930 display of pending merge information altogether, use the no-pending op‐
2931 tion or specify a file/directory.
2932 To compare the working directory to a specific revision, pass a single
2934 revision to the revision argument.
2935 To see which files have changed in a specific revision, or between two
2937 revisions, pass a revision range to the revision argument. This will
2938 produce the same results as calling 'brz diff --summarize'.
2939 brz switch [TO_LOCATION]
2942 Options:
2943 --create-branch, -b Create the target branch from this one
2944 before switching to it.
2945 --directory ARG, -d Branch to operate on, instead of working
2946 directory.
2947 --force Switch even if local commits will be
2948 lost.
2949 --help, -h Show help message.
2950 --quiet, -q Only display errors and warnings.
2951 --revision ARG, -r See "help revisionspec" for details.
2952 --store Store and restore uncommitted changes in
2953 the branch.
2954 --usage Show usage message and options.
2955 --verbose, -v Display more information.
2956 Set the branch of a checkout and update.
2958 For lightweight checkouts, this changes the branch being referenced.
2960 For heavyweight checkouts, this checks that there are no local commits
2961 versus the current bound branch, then it makes the local branch a mir‐
2962 ror of the new location and binds to it.
2963 In both cases, the working tree is updated and uncommitted changes are
2965 merged. The user can commit or revert these as they desire.
2966 Pending merges need to be committed or reverted before using switch.
2968 The path to the branch to switch to can be specified relative to the
2970 parent directory of the current branch. For example, if you are cur‐
2971 rently in a checkout of /path/to/branch, specifying 'newbranch' will
2972 find a branch at /path/to/newbranch.
2973 Bound branches use the nickname of its master branch unless it is set
2975 locally, in which case switching will update the local nickname to be
2976 that of the master.
2977 brz tag [TAG_NAME]
2980 Options:
2981 --delete Delete this tag rather than placing it.
2982 --directory ARG, -d Branch in which to place the tag.
2983 --force Replace existing tags.
2984 --help, -h Show help message.
2985 --quiet, -q Only display errors and warnings.
2986 --revision ARG, -r See "help revisionspec" for details.
2987 --usage Show usage message and options.
2988 --verbose, -v Display more information.
2989 See also: commit, tags
2991 Create, remove or modify a tag naming a revision.
2993 Tags give human-meaningful names to revisions. Commands that take a -r
2995 (--revision) option can be given -rtag:X, where X is any previously
2996 created tag.
2997 Tags are stored in the branch. Tags are copied from one branch to an‐
2999 other along when you branch, push, pull or merge.
3000 It is an error to give a tag name that already exists unless you pass
3002 --force, in which case the tag is moved to point to the new revision.
3003 To rename a tag (change the name but keep it on the same revsion), run
3005 \*(Aq\*(Aqbrz tag new-name -r tag:old-name\*(Aq\*(Aq and then
3006 \*(Aq\*(Aqbrz tag --delete oldname\*(Aq\*(Aq.
3007 If no tag name is specified it will be determined through the 'auto‐
3009 matic_tag_name' hook. This can e.g. be used to automatically tag up‐
3010 stream releases by reading configure.ac. See \*(Aq\*(Aqbrz help
3011 hooks\*(Aq\*(Aq for details.
3012 brz tags
3015 Options:
3016 --directory ARG, -d Branch whose tags should be displayed.
3017 --help, -h Show help message.
3018 --quiet, -q Only display errors and warnings.
3019 --revision ARG, -r See "help revisionspec" for details.
3020 --show-ids Show internal object ids.
3021 --sort ARG Sort tags by different criteria.
3022 --usage Show usage message and options.
3023 --verbose, -v Display more information.
3024 See also: tag
3026 List tags.
3028 This command shows a table of tag names and the revisions they refer‐
3030 ence.
3031 brz testament [BRANCH]
3034 Options:
3035 --help, -h Show help message.
3036 --long Produce long-format testament.
3037 --quiet, -q Only display errors and warnings.
3038 --revision ARG, -r See "help revisionspec" for details.
3039 --strict Produce a strict-format testament.
3040 --usage Show usage message and options.
3041 --verbose, -v Display more information.
3042 Show testament (signing-form) of a revision.
3044 brz unbind
3047 Options:
3048 --directory ARG, -d Branch to operate on, instead of working
3049 directory.
3050 --help, -h Show help message.
3051 --quiet, -q Only display errors and warnings.
3052 --usage Show usage message and options.
3053 --verbose, -v Display more information.
3054 See also: bind, checkouts
3056 Convert the current checkout into a regular branch.
3058 After unbinding, the local branch is considered independent and subse‐
3060 quent commits will be local only.
3061 brz uncommit [LOCATION]
3064 Options:
3065 --dry-run Don't actually make changes.
3066 --force Say yes to all questions.
3067 --help, -h Show help message.
3068 --keep-tags Keep tags that point to removed
3069 revisions.
3070 --local Only remove the commits from the local
3071 branch when in a checkout.
3072 --quiet, -q Only display errors and warnings.
3073 --revision ARG, -r See "help revisionspec" for details.
3074 --usage Show usage message and options.
3075 --verbose, -v Display more information.
3076 See also: commit
3078 Remove the last committed revision.
3080 --verbose will print out what is being removed. --dry-run will go
3082 through all the motions, but not actually remove anything.
3083 If --revision is specified, uncommit revisions to leave the branch at
3085 the specified revision. For example, "brz uncommit -r 15" will leave
3086 the branch at revision 15.
3087 Uncommit leaves the working tree ready for a new commit. The only
3089 change it may make is to restore any pending merges that were present
3090 before the commit.
3091 brz unshelve [SHELF_ID]
3094 Options:
3095 --action ARG The action to perform.
3096 --apply Apply changes and remove from the shelf.
3097 --delete-only Delete changes without applying them.
3098 --dry-run Show changes, but do not apply or remove
3099 them.
3100 --keep Apply changes but don't delete them.
3101 --preview Instead of unshelving the changes, show
3102 the diff that would result from
3103 unshelving.
3104 --directory ARG, -d Branch to operate on, instead of working
3105 directory.
3106 --help, -h Show help message.
3107 --quiet, -q Only display errors and warnings.
3108 --usage Show usage message and options.
3109 --verbose, -v Display more information.
3110 See also: shelve
3112 Restore shelved changes.
3114 By default, the most recently shelved changes are restored. However if
3116 you specify a shelf by id those changes will be restored instead. This
3117 works best when the changes don't depend on each other.
3118 brz up
3121 Alias for "update", see "brz update".
3122 brz update [DIR]
3124 Options:
3125 --help, -h Show help message.
3126 --quiet, -q Only display errors and warnings.
3127 --revision ARG, -r See "help revisionspec" for details.
3128 --show-base Show base revision text in conflicts.
3129 --usage Show usage message and options.
3130 --verbose, -v Display more information.
3131 Alias: up
3133 See also: pull, status-flags, working-trees
3135 Update a working tree to a new revision.
3137 This will perform a merge of the destination revision (the tip of the
3139 branch, or the specified revision) into the working tree, and then make
3140 that revision the basis revision for the working tree.
3141 You can use this to visit an older revision, or to update a working
3143 tree that is out of date from its branch.
3144 If there are any uncommitted changes in the tree, they will be carried
3146 across and remain as uncommitted changes after the update. To discard
3147 these changes, use 'brz revert'. The uncommitted changes may conflict
3148 with the changes brought in by the change in basis revision.
3149 If the tree's branch is bound to a master branch, brz will also update
3151 the branch from the master.
3152 You cannot update just a single file or directory, because each Breezy
3154 working tree has just a single basis revision. If you want to restore
3155 a file that has been removed locally, use 'brz revert' instead of 'brz
3156 update'. If you want to restore a file to its state in a previous re‐
3157 vision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
3158 out the old content of that file to a new location.
3159 The 'dir' argument, if given, must be the location of the root of a
3161 working tree to update. By default, the working tree that contains the
3162 current working directory is used.
3163 brz upgrade [URL]
3166 Options:
3167 --clean Remove the backup.bzr directory if
3168 successful.
3169 --dry-run Show what would be done, but don't
3170 actually do anything.
3171 --format ARG Upgrade to a specific format. See "brz
3172 help formats" for details.
3173 --2a Format for the bzr 2.0 series.
3174 --bzr Format for the bzr 2.0 series.
3175 --default Format for the bzr 2.0 series.
3176 --git GIT repository.
3177 --git-bare Bare GIT repository (no working tree).
3178 --help, -h Show help message.
3179 --quiet, -q Only display errors and warnings.
3180 --usage Show usage message and options.
3181 --verbose, -v Display more information.
3182 See also: check, formats, reconcile
3184 Upgrade a repository, branch or working tree to a newer format.
3186 When the default format has changed after a major new release of
3188 Bazaar/Breezy, you may be informed during certain operations that you
3189 should upgrade. Upgrading to a newer format may improve performance or
3190 make new features available. It may however limit interoperability with
3191 older repositories or with older versions of Bazaar or Breezy.
3192 If you wish to upgrade to a particular format rather than the current
3194 default, that can be specified using the --format option. As a conse‐
3195 quence, you can use the upgrade command this way to "downgrade" to an
3196 earlier format, though some conversions are a one way process (e.g.
3197 changing from the 1.x default to the 2.x default) so downgrading is not
3198 always possible.
3199 A backup.bzr.~#~ directory is created at the start of the conversion
3201 process (where # is a number). By default, this is left there on com‐
3202 pletion. If the conversion fails, delete the new .bzr directory and re‐
3203 name this one back in its place. Use the --clean option to ask for the
3204 backup.bzr directory to be removed on successful conversion. Alterna‐
3205 tively, you can delete it by hand if everything looks good afterwards.
3206 If the location given is a shared repository, dependent branches are
3208 also converted provided the repository converts successfully. If the
3209 conversion of a branch fails, remaining branches are still tried.
3210 For more information on upgrades, see the Breezy Upgrade Guide,
3212 https://www.breezy-vcs.org/doc/en/upgrade-guide/.
3213 brz verify-signatures [LOCATION]
3216 Options:
3217 --acceptable-keys ARG, -k Comma separated list of GPG key patterns
3218 which are acceptable for verification.
3219 --help, -h Show help message.
3220 --quiet, -q Only display errors and warnings.
3221 --revision ARG, -r See "help revisionspec" for details.
3222 --usage Show usage message and options.
3223 --verbose, -v Display more information.
3224 Verify all commit signatures.
3226 Verifies that all commits in the branch are signed by known GnuPG keys.
3228 brz version
3231 Options:
3232 --help, -h Show help message.
3233 --quiet, -q Only display errors and warnings.
3234 --short Print just the version number.
3235 --usage Show usage message and options.
3236 --verbose, -v Display more information.
3237 Show version of brz.
3239 brz version-info [LOCATION]
3242 Options:
3243 --all Include all possible information.
3244 --check-clean Check if tree is clean.
3245 --format ARG Select the output format.
3246 --custom Version info in Custom template-based
3247 format.
3248 --python Version info in Python format.
3249 --rio Version info in RIO (simple text) format
3250 (default).
3251 --yaml Version info in YAML format.
3252 --help, -h Show help message.
3253 --include-file-revisions Include the last revision for each file.
3254 --include-history Include the revision-history.
3255 --quiet, -q Only display errors and warnings.
3256 --revision ARG, -r See "help revisionspec" for details.
3257 --template ARG Template for the output.
3258 --usage Show usage message and options.
3259 --verbose, -v Display more information.
3260 Show version information about this tree.
3262 You can use this command to add information about version into source
3264 code of an application. The output can be in one of the supported for‐
3265 mats or in a custom format based on a template.
3266 For example:
3268 brz version-info --custom \
3270 --template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n"
3271 will produce a C header file with formatted string containing the cur‐
3273 rent revision number. Other supported variables in templates are:
3274 * {date} - date of the last revision
3276 * {build_date} - current date
3277 * {revno} - revision number
3278 * {revision_id} - revision id
3279 * {branch_nick} - branch nickname
3280 * {clean} - 0 if the source tree contains uncommitted changes,
3281 otherwise 1
3282 brz view [FILE...]
3285 Options:
3286 --all Apply list or delete action to all
3287 views.
3288 --delete Delete the view.
3289 --help, -h Show help message.
3290 --name ARG Name of the view to define, list or
3291 delete.
3292 --quiet, -q Only display errors and warnings.
3293 --switch ARG Name of the view to switch to.
3294 --usage Show usage message and options.
3295 --verbose, -v Display more information.
3296 Manage filtered views.
3298 Views provide a mask over the tree so that users can focus on a subset
3300 of a tree when doing their work. After creating a view, commands that
3301 support a list of files - status, diff, commit, etc - effectively have
3302 that list of files implicitly given each time. An explicit list of
3303 files can still be given but those files must be within the current
3304 view.
3305 In most cases, a view has a short life-span: it is created to make a
3307 selected change and is deleted once that change is committed. At other
3308 times, you may wish to create one or more named views and switch be‐
3309 tween them.
3310 To disable the current view without deleting it, you can switch to the
3312 pseudo view called \*(Aq\*(Aqoff\*(Aq\*(Aq. This can be useful when you
3313 need to see the whole tree for an operation or two (e.g. merge) but
3314 want to switch back to your view after that.
3315 Examples:
3317 To define the current view:
3318 brz view file1 dir1 ...
3320 To list the current view:
3322 brz view
3324 To delete the current view:
3326 brz view --delete
3328 To disable the current view without deleting it:
3330 brz view --switch off
3332 To define a named view and switch to it:
3334 brz view --name view-name file1 dir1 ...
3336 To list a named view:
3338 brz view --name view-name
3340 To delete a named view:
3342 brz view --name view-name --delete
3344 To switch to a named view:
3346 brz view --switch view-name
3348 To list all views defined:
3350 brz view --all
3352 To delete all views:
3354 brz view --delete --all
3356 brz whoami [NAME]
3359 Options:
3360 --branch Set identity for the current branch
3361 instead of globally.
3362 --directory ARG, -d Branch to operate on, instead of working
3363 directory.
3364 --email Display email address only.
3365 --help, -h Show help message.
3366 --quiet, -q Only display errors and warnings.
3367 --usage Show usage message and options.
3368 --verbose, -v Display more information.
3369 Show or set brz user id.
3371 Examples:
3373 Show the email of the current user:
3374 brz whoami --email
3376 Set the current user:
3378 brz whoami "Frank Chu <fchu@example.com>"
3380
3383 BRZPATH
3384 Path where brz is to look for shell plugin external commands.
3385 BRZ_EMAIL
3387 E-Mail address of the user. Overrides EMAIL.
3388 EMAIL E-Mail address of the user.
3390 BRZ_EDITOR
3392 Editor for editing commit messages. Overrides EDITOR.
3393 EDITOR Editor for editing commit messages.
3395 BRZ_PLUGIN_PATH
3397 Paths where brz should look for plugins.
3398 BRZ_DISABLE_PLUGINS
3400 Plugins that brz should not load.
3401 BRZ_PLUGINS_AT
3403 Plugins to load from a directory not in BRZ_PLUGIN_PATH.
3404 BRZ_HOME
3406 Directory holding breezy config dir. Overrides HOME.
3407 BRZ_HOME (Win32)
3409 Directory holding breezy config dir. Overrides APPDATA and HOME.
3410 BZR_REMOTE_PATH
3412 Full name of remote 'brz' command (for brz+ssh:// URLs).
3413 BRZ_SSH
3415 Path to SSH client, or one of paramiko, openssh, sshcorp, plink
3416 or lsh.
3417 BRZ_LOG
3419 Location of brz.log (use '/dev/null' to suppress log).
3420 BRZ_LOG (Win32)
3422 Location of brz.log (use 'NUL' to suppress log).
3423 BRZ_COLUMNS
3425 Override implicit terminal width.
3426 BRZ_CONCURRENCY
3428 Number of processes that can be run concurrently (selftest)
3429 BRZ_PROGRESS_BAR
3431 Override the progress display. Values are 'none' or 'text'.
3432 BRZ_PDB
3434 Control whether to launch a debugger on error.
3435 BRZ_SIGQUIT_PDB
3437 Control whether SIGQUIT behaves normally or invokes a breakin
3438 debugger.
3439 BRZ_TEXTUI_INPUT
3441 Force console input mode for prompts to line-based (instead of
3442 char-based).
3443
3445 ~/.config/breezy/breezy.conf
3446 Contains the user's default configuration. The section [DEFAULT]
3447 is used to define general configuration that will be applied ev‐
3448 erywhere. The section [ALIASES] can be used to create command
3449 aliases for commonly used options.
3450 A typical config file might look something like:
3452 [DEFAULT]
3454 email=John Doe <jdoe@isp.com>
3455 [ALIASES]
3456 commit = commit --strict
3457 log10 = log --short -r -10..-1
3458
3460 https://www.breezy-vcs.org/
34613.3.3 2023-07-24 brz(1)