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 --revision ARG, -r See "help revisionspec" for details.
1083 --root ARG Name of the root directory inside the
1084 exported file.
1085 --uncommitted Export the working tree contents rather
1086 than that of the last revision.
1087 --usage Show usage message and options.
1088 --verbose, -v Display more information.
1089 Export current or past revision to a destination directory or archive.
1091 If no revision is specified this exports the last committed revision.
1093 Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1095 given, try to find the format with the extension. If no extension is
1096 found exports to a directory (equivalent to --format=dir).
1097 If root is supplied, it will be used as the root directory inside con‐
1099 tainer formats (tar, zip, etc). If it is not supplied it will default
1100 to the exported filename. The root option has no effect for 'dir' for‐
1101 mat.
1102 If branch is omitted then the branch containing the current working di‐
1104 rectory will be used.
1105 Note: Export of tree with non-ASCII filenames to zip is not supported.
1107 ================= =========================
1109 Supported formats Autodetected by extension
1110 ================= =========================
1111 dir (none)
1112 tar .tar
1113 tbz2 .tar.bz2, .tbz2
1114 tgz .tar.gz, .tgz
1115 zip .zip
1116 ================= =========================
1117 brz grep PATTERN [PATH...]
1120 Options:
1121 --color WHEN Show match in color. WHEN is never,
1122 always or auto.
1123 --diff, -p Grep for pattern in changeset for each
1124 revision.
1125 --exclude GLOB, -X Skip files whose base name matches GLOB.
1126 --files-with-matches, -l Print only the name of each input file
1127 in which PATTERN is found.
1128 --files-without-match, -L Print only the name of each input file
1129 in which PATTERN is not found.
1130 --fixed-string, -F Interpret PATTERN is a single fixed
1131 string (not regex).
1132 --from-root Search for pattern starting from the
1133 root of the branch. (implies
1134 --recursive)
1135 --help, -h Show help message.
1136 --ignore-case, -i Ignore case distinctions while matching.
1137 --include GLOB, -I Search only files whose base name
1138 matches GLOB.
1139 --levels N Number of levels to display - 0 for all,
1140 1 for collapsed (1 is default).
1141 --line-number, -n Show 1-based line number.
1142 --no-recursive Don't recurse into subdirectories.
1143 (default is --recursive)
1144 --null, -Z Write an ASCII NUL (\0) separator
1145 between output lines rather than a
1146 newline.
1147 --quiet, -q Only display errors and warnings.
1148 --revision ARG, -r See "help revisionspec" for details.
1149 --usage Show usage message and options.
1150 --verbose, -v Display more information.
1151 Print lines matching PATTERN for specified files and revisions.
1153 This command searches the specified files and revisions for a given
1155 pattern. The pattern is specified as a Python regular expressions[1].
1156 If the file name is not specified, the revisions starting with the cur‐
1158 rent directory are searched recursively. If the revision number is not
1159 specified, the working copy is searched. To search the last committed
1160 revision, use the '-r -1' or '-r last:1' option.
1161 Unversioned files are not searched unless explicitly specified on the
1163 command line. Unversioned directores are not searched.
1164 When searching a pattern, the output is shown in the 'filepath:string'
1166 format. If a revision is explicitly searched, the output is shown as
1167 'filepath~N:string', where N is the revision number.
1168 --include and --exclude options can be used to search only (or exclude
1170 from search) files with base name matches the specified Unix style GLOB
1171 pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \
1172 to quote wildcard or backslash character literally. Note that the glob
1173 pattern is not a regular expression.
1174 [1] http://docs.python.org/library/re.html#regular-expression-syntax
1176 brz help [TOPIC]
1179 Options:
1180 --help, -h Show help message.
1181 --long Show help on all commands.
1182 --quiet, -q Only display errors and warnings.
1183 --usage Show usage message and options.
1184 --verbose, -v Display more information.
1185 Aliases: ?, --help, -?, -h
1187 See also: topics
1189 Show help on a command or other topic.
1191 brz ignore [NAME_PATTERN...]
1195 Options:
1196 --default-rules Display the default ignore rules that
1197 brz uses.
1198 --directory ARG, -d Branch to operate on, instead of working
1199 directory.
1200 --help, -h Show help message.
1201 --quiet, -q Only display errors and warnings.
1202 --usage Show usage message and options.
1203 --verbose, -v Display more information.
1204 See also: ignored, patterns, status
1206 Ignore specified files or patterns.
1208 See \*(Aq\*(Aqbrz help patterns\*(Aq\*(Aq for details on the syntax of
1210 patterns.
1211 If a .bzrignore file does not exist, the ignore command will create one
1213 and add the specified files or patterns to the newly created file. The
1214 ignore command will also automatically add the.bzrignore file to be
1215 versioned. Creating a .bzrignore file without the use of the ignore
1216 command will require an explicit add command.
1217 To remove patterns from the ignore list, edit the .bzrignore file. Af‐
1219 ter adding, editing or deleting that file either indirectly by using
1220 this command or directly by using an editor, be sure to commit it.
1221 Breezy also supports a global ignore file ~/.config/breezy/ignore. On
1223 Windows the global ignore file can be found in the application data di‐
1224 rectory as C:\Documents and Settings\<user>\Application
1225 Data\Breezy\3.0\ignore. Global ignores are not touched by this com‐
1226 mand. The global ignore file can be edited directly using an editor.
1227 Patterns prefixed with '!' are exceptions to ignore patterns and take
1229 precedence over regular ignores. Such exceptions are used to specify
1230 files that should be versioned which would otherwise be ignored.
1231 Patterns prefixed with '!!' act as regular ignore patterns, but have
1233 precedence over the '!' exception patterns.
1234 Notes:
1236 * Ignore patterns containing shell wildcards must be quoted from
1238 the shell on Unix.
1239 * Ignore patterns starting with "#" act as comments in the ignore file.
1241 To ignore patterns that begin with that character, use the "RE:" pre‐
1242 fix.
1243 Examples:
1245 Ignore the top level Makefile:
1246 brz ignore ./Makefile
1248 Ignore .class files in all directories...:
1250 brz ignore "*.class"
1252 ...but do not ignore "special.class":
1254 brz ignore "!special.class"
1256 Ignore files whose name begins with the "#" character:
1258 brz ignore "RE:^#"
1260 Ignore .o files under the lib directory:
1262 brz ignore "lib/**/*.o"
1264 Ignore .o files under the lib directory:
1266 brz ignore "RE:lib/.*\.o"
1268 Ignore everything but the "debian" toplevel directory:
1270 brz ignore "RE:(?!debian/).*"
1272 Ignore everything except the "local" toplevel directory,
1274 but always ignore autosave files ending in ~, even under local/:
1275 brz ignore "*"
1277 brz ignore "!./local"
1278 brz ignore "!!*~"
1279 brz ignored
1282 Options:
1283 --directory ARG, -d Branch to operate on, instead of working
1284 directory.
1285 --help, -h Show help message.
1286 --quiet, -q Only display errors and warnings.
1287 --usage Show usage message and options.
1288 --verbose, -v Display more information.
1289 See also: ignore, ls
1291 List ignored files and the patterns that matched them.
1293 List all the ignored files and the ignore pattern that caused the file
1295 to be ignored.
1296 Alternatively, to list just the files:
1298 brz ls --ignored
1300 brz import SOURCE [TREE]
1303 Options:
1304 --help, -h Show help message.
1305 --quiet, -q Only display errors and warnings.
1306 --usage Show usage message and options.
1307 --verbose, -v Display more information.
1308 Import sources from a directory, tarball or zip file
1310 This command will import a directory, tarball or zip file into a bzr
1312 tree, replacing any versioned files already present. If a directory is
1313 specified, it is used as the target. If the directory does not exist,
1314 or is not versioned, it is created.
1315 Tarballs may be gzip or bzip2 compressed. This is autodetected.
1317 If the tarball or zip has a single root directory, that directory is
1319 stripped when extracting the tarball. This is not done for directo‐
1320 ries.
1321 brz info [LOCATION]
1324 Options:
1325 --help, -h Show help message.
1326 --quiet, -q Only display errors and warnings.
1327 --usage Show usage message and options.
1328 --verbose, -v Display more information.
1329 See also: repositories, revno, working-trees
1331 Show information about a working tree, branch or repository.
1333 This command will show all known locations and formats associated to
1335 the tree, branch or repository.
1336 In verbose mode, statistical information is included with each report.
1338 To see extended statistic information, use a verbosity level of 2 or
1339 higher by specifying the verbose option multiple times, e.g. -vv.
1340 Branches and working trees will also report any missing revisions.
1342 Examples:
1344 Display information on the format and related locations:
1346 brz info
1348 Display the above together with extended format information and
1350 basic statistics (like the number of files in the working tree and
1351 number of revisions in the branch and repository):
1352 brz info -v
1354 Display the above together with number of committers to the branch:
1356 brz info -vv
1358 brz init [LOCATION]
1361 Options:
1362 --append-revisions-only Never change revnos or the existing log.
1363 Append revisions to it only.
1364 --create-prefix Create the path leading up to the branch
1365 if it does not already exist.
1366 --format ARG Specify a format for this branch. See
1367 "help formats" for a full list.
1368 --2a Format for the bzr 2.0 series.
1369 --bzr Format for the bzr 2.0 series.
1370 --default Format for the bzr 2.0 series.
1371 --git GIT repository.
1372 --git-bare Bare GIT repository (no working tree).
1373 --help, -h Show help message.
1374 --no-tree Create a branch without a working tree.
1375 --quiet, -q Only display errors and warnings.
1376 --usage Show usage message and options.
1377 --verbose, -v Display more information.
1378 See also: branch, checkout, init-shared-repository
1380 Make a directory into a versioned branch.
1382 Use this to create an empty branch, or before importing an existing
1384 project.
1385 If there is a repository in a parent directory of the location, then
1387 the history of the branch will be stored in the repository. Otherwise
1388 init creates a standalone branch which carries its own history in the
1389 .bzr directory.
1390 If there is already a branch at the location but it has no working
1392 tree, the tree can be populated with 'brz checkout'.
1393 Recipe for importing a tree of files:
1395 cd ~/project
1397 brz init
1398 brz add .
1399 brz status
1400 brz commit -m "imported project"
1401 brz init-repo
1404 Alias for "init-shared-repository", see "brz init-shared-repository".
1405 brz init-shared-repo
1407 Alias for "init-shared-repository", see "brz init-shared-repository".
1408 brz init-shared-repository LOCATION
1410 Options:
1411 --format ARG Specify a format for this repository.
1412 See "brz help formats" for details.
1413 --2a Format for the bzr 2.0 series.
1414 --bzr Format for the bzr 2.0 series.
1415 --default Format for the bzr 2.0 series.
1416 --git GIT repository.
1417 --git-bare Bare GIT repository (no working tree).
1418 --help, -h Show help message.
1419 --no-trees Branches in the repository will default
1420 to not having a working tree.
1421 --quiet, -q Only display errors and warnings.
1422 --usage Show usage message and options.
1423 --verbose, -v Display more information.
1424 Aliases: init-shared-repo, init-repo
1426 See also: branch, checkout, init, repositories
1428 Create a shared repository for branches to share storage space.
1430 New branches created under the repository directory will store their
1432 revisions in the repository, not in the branch directory. For branches
1433 with shared history, this reduces the amount of storage needed and
1434 speeds up the creation of new branches.
1435 If the --no-trees option is given then the branches in the repository
1437 will not have working trees by default. They will still exist as di‐
1438 rectories on disk, but they will not have separate copies of the files
1439 at a certain revision. This can be useful for repositories that store
1440 branches which are interacted with through checkouts or remote
1441 branches, such as on a server.
1442 Examples:
1444 Create a shared repository holding just branches:
1445 brz init-shared-repo --no-trees repo
1447 brz init repo/trunk
1448 Make a lightweight checkout elsewhere:
1450 brz checkout --lightweight repo/trunk trunk-checkout
1452 cd trunk-checkout
1453 (add files here)
1454 brz join TREE
1457 Options:
1458 --help, -h Show help message.
1459 --quiet, -q Only display errors and warnings.
1460 --usage Show usage message and options.
1461 --verbose, -v Display more information.
1462 See also: split
1464 Combine a tree into its containing tree.
1466 This command requires the target tree to be in a rich-root format.
1468 The TREE argument should be an independent tree, inside another tree,
1470 but not part of it. (Such trees can be produced by "brz split", but
1471 also by running "brz branch" with the target inside a tree.)
1472 The result is a combined tree, with the subtree no longer an indepen‐
1474 dent part. This is marked as a merge of the subtree into the contain‐
1475 ing tree, and all history is preserved.
1476 brz launchpad-login [NAME]
1479 Options:
1480 --help, -h Show help message.
1481 --no-check Don't check that the user name is valid.
1482 --quiet, -q Only display errors and warnings.
1483 --usage Show usage message and options.
1484 --verbose, -v Display more information.
1485 Alias: lp-login
1487 Show or set the Launchpad user ID.
1489 When communicating with Launchpad, some commands need to know your
1491 Launchpad user ID. This command can be used to set or show the user ID
1492 that Bazaar will use for such communication.
1493 Examples:
1495 Show the Launchpad ID of the current user:
1496 brz launchpad-login
1498 Set the Launchpad ID of the current user to 'bob':
1500 brz launchpad-login bob
1502 brz launchpad-logout
1505 Options:
1506 --help, -h Show help message.
1507 --quiet, -q Only display errors and warnings.
1508 --usage Show usage message and options.
1509 --verbose, -v Display more information.
1510 Alias: lp-logout
1512 Unset the Launchpad user ID.
1514 When communicating with Launchpad, some commands need to know your
1516 Launchpad user ID. This command will log you out from Launchpad. This
1517 means that communication with Launchpad will happen over HTTPS, and
1518 will not require one of your SSH keys to be available.
1519 brz launchpad-open [LOCATION]
1522 Options:
1523 --dry-run Do not actually open the browser. Just
1524 say the URL we would use.
1525 --help, -h Show help message.
1526 --quiet, -q Only display errors and warnings.
1527 --usage Show usage message and options.
1528 --verbose, -v Display more information.
1529 Alias: lp-open
1531 Open a Launchpad branch page in your web browser.
1533 brz link-tree LOCATION
1536 Options:
1537 --help, -h Show help message.
1538 --quiet, -q Only display errors and warnings.
1539 --usage Show usage message and options.
1540 --verbose, -v Display more information.
1541 Hardlink matching files to another tree.
1543 Only files with identical content and execute bit will be linked.
1545 brz log [FILE...]
1548 Options:
1549 --authors ARG What names to list as authors - first,
1550 all or committer.
1551 --change ARG, -c Show just the specified revision. See
1552 also "help revisionspec".
1553 --exclude-common-ancestry Display only the revisions that are not
1554 part of both ancestries (require
1555 -rX..Y).
1556 --forward Show from oldest to newest.
1557 --help, -h Show help message.
1558 --include-merged Show merged revisions like --levels 0
1559 does.
1560 --levels N, -n Number of levels to display - 0 for all,
1561 1 for flat.
1562 --limit N, -l Limit the output to the first N
1563 revisions.
1564 --log-format ARG Use specified log format.
1565 --gnu-changelog Format used by GNU ChangeLog files.
1566 --line Log format with one line per revision.
1567 --long Detailed log format.
1568 --short Moderately short log format.
1569 --match ARG, -m Show revisions whose properties match
1570 this expression.
1571 --match-author ARG Show revisions whose authors match this
1572 expression.
1573 --match-bugs ARG Show revisions whose bugs match this
1574 expression.
1575 --match-committer ARG Show revisions whose committer matches
1576 this expression.
1577 --match-message ARG Show revisions whose message matches
1578 this expression.
1579 --omit-merges Do not report commits with more than one
1580 parent.
1581 --quiet, -q Only display errors and warnings.
1582 --revision ARG, -r See "help revisionspec" for details.
1583 --show-diff, -p Show changes made in each revision as a
1584 patch.
1585 --show-ids Show internal object ids.
1586 --signatures Show digital signature validity.
1587 --timezone ARG Display timezone as local, original, or
1588 utc.
1589 --usage Show usage message and options.
1590 --verbose, -v Show files changed in each revision.
1591 See also: log-formats, revisionspec
1593 Show historical log for a branch or subset of a branch.
1595 log is brz's default tool for exploring the history of a branch. The
1597 branch to use is taken from the first parameter. If no parameters are
1598 given, the branch containing the working directory is logged. Here are
1599 some simple examples:
1600 brz log log the current branch
1602 brz log foo.py log a file in its branch
1603 brz log http://server/branch log a branch on a server
1604 The filtering, ordering and information shown for each revision can be
1606 controlled as explained below. By default, all revisions are shown
1607 sorted (topologically) so that newer revisions appear before older ones
1608 and descendants always appear before ancestors. If displayed, merged
1609 revisions are shown indented under the revision in which they were
1610 merged.
1611 Output control:
1613 The log format controls how information about each revision is
1615 displayed. The standard log formats are called \*(Aq\*(Aq‐
1616 long\*(Aq\*(Aq, \*(Aq\*(Aqshort\*(Aq\*(Aq
1617 and \*(Aq\*(Aqline\*(Aq\*(Aq. The default is long. See \*(Aq\*(Aqbrz
1618 help log-formats\*(Aq\*(Aq
1619 for more details on log formats.
1620 The following options can be used to control what information is
1622 displayed:
1623 -l N display a maximum of N revisions
1625 -n N display N levels of revisions (0 for all, 1 for col‐
1626 lapsed)
1627 -v display a status summary (delta) for each revision
1628 -p display a diff (patch) for each revision
1629 --show-ids display revision-ids (and file-ids), not just revnos
1630 Note that the default number of levels to display is a function of
1632 the
1633 log format. If the -n option is not used, the standard log formats
1634 show
1635 just the top level (mainline).
1636 Status summaries are shown using status flags like A, M, etc. To see
1638 the changes explained using words like \*(Aq\*(Aqadded\*(Aq\*(Aq and
1639 \*(Aq\*(Aqmodified\*(Aq\*(Aq
1640 instead, use the -vv option.
1641 Ordering control:
1643 To display revisions from oldest to newest, use the --forward option.
1645 In most cases, using this option will have little impact on the total
1646 time taken to produce a log, though --forward does not incrementally
1647 display revisions like --reverse does when it can.
1648 Revision filtering:
1650 The -r option can be used to specify what revision or range of revi‐
1652 sions
1653 to filter against. The various forms are shown below:
1654 -rX display revision X
1656 -rX.. display revision X and later
1657 -r..Y display up to and including revision Y
1658 -rX..Y display from X to Y inclusive
1659 See \*(Aq\*(Aqbrz help revisionspec\*(Aq\*(Aq for details on how to
1661 specify X and Y.
1662 Some common examples are given below:
1663 -r-1 show just the tip
1665 -r-10.. show the last 10 mainline revisions
1666 -rsubmit:.. show what's new on this branch
1667 -rancestor:path.. show changes since the common ancestor of this
1668 branch and the one at location path
1669 -rdate:yesterday.. show changes since yesterday
1670 When logging a range of revisions using -rX..Y, log starts at
1672 revision Y and searches back in history through the primary
1673 ("left-hand") parents until it finds X. When logging just the
1674 top level (using -n1), an error is reported if X is not found
1675 along the way. If multi-level logging is used (-n0), X may be
1676 a nested merge revision and the log will be truncated accordingly.
1677 Path filtering:
1679 If parameters are given and the first one is not a branch, the log
1681 will be filtered to show only those revisions that changed the
1682 nominated files or directories.
1683 Filenames are interpreted within their historical context. To log a
1685 deleted file, specify a revision range so that the file existed at
1686 the end or start of the range.
1687 Historical context is also important when interpreting pathnames of
1689 renamed files/directories. Consider the following example:
1690 * revision 1: add tutorial.txt
1692 * revision 2: modify tutorial.txt
1693 * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
1694 In this case:
1696 * \*(Aq\*(Aqbrz log guide.txt\*(Aq\*(Aq will log the file added in
1698 revision 1
1699 * \*(Aq\*(Aqbrz log tutorial.txt\*(Aq\*(Aq will log the new file
1701 added in revision 3
1702 * \*(Aq\*(Aqbrz log -r2 -p tutorial.txt\*(Aq\*(Aq will show the
1704 changes made to
1705 the original file in revision 2.
1706 * \*(Aq\*(Aqbrz log -r2 -p guide.txt\*(Aq\*(Aq will display an error
1708 message as there
1709 was no file called guide.txt in revision 2.
1710 Renames are always followed by log. By design, there is no need to
1712 explicitly ask for this (and no way to stop logging a file back
1713 until it was last renamed).
1714 Other filtering:
1716 The --match option can be used for finding revisions that match a
1718 regular expression in a commit message, committer, author or bug.
1719 Specifying the option several times will match any of the supplied
1720 expressions. --match-author, --match-bugs, --match-committer and
1721 --match-message can be used to only match a specific field.
1722 Tips & tricks:
1724 GUI tools and IDEs are often better at exploring history than command
1726 line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
1727 bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
1728 Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
1729 <http://wiki.bazaar.canonical.com/IDEIntegration>.
1730 You may find it useful to add the aliases below to
1732 \*(Aq\*(Aqbreezy.conf\*(Aq\*(Aq:
1733 [ALIASES]
1735 tip = log -r-1
1736 top = log -l10 --line
1737 show = log -v -p
1738 \*(Aq\*(Aqbrz tip\*(Aq\*(Aq will then show the latest revision while
1740 \*(Aq\*(Aqbrz top\*(Aq\*(Aq
1741 will show the last 10 mainline revisions. To see the details of a
1742 particular revision X, \*(Aq\*(Aqbrz show -rX\*(Aq\*(Aq.
1743 If you are interested in looking deeper into a particular merge X,
1745 use \*(Aq\*(Aqbrz log -n0 -rX\*(Aq\*(Aq.
1746 \*(Aq\*(Aqbrz log -v\*(Aq\*(Aq on a branch with lots of history is
1748 currently
1749 very slow. A fix for this issue is currently under development.
1750 With or without that fix, it is recommended that a revision range
1751 be given when using the -v option.
1752 brz has a generic full-text matching plugin, brz-search, that can be
1754 used to find revisions matching user names, commit messages, etc.
1755 Among other features, this plugin can find all revisions containing
1756 a list of words but not others.
1757 When exploring non-mainline history on large projects with deep
1759 history, the performance of log can be greatly improved by installing
1760 the historycache plugin. This plugin buffers historical information
1761 trading disk space for faster speed.
1762 brz lp-find-proposal
1765 Options:
1766 --help, -h Show help message.
1767 --quiet, -q Only display errors and warnings.
1768 --revision ARG, -r See "help revisionspec" for details.
1769 --usage Show usage message and options.
1770 --verbose, -v Display more information.
1771 Find the proposal to merge this revision.
1773 Finds the merge proposal(s) that discussed landing the specified revi‐
1775 sion. This works only if the if the merged_revno was recorded for the
1776 merge proposal. The proposal(s) are opened in a web browser.
1777 Only the revision specified is searched for. To find the mainline re‐
1779 vision that merged it into mainline, use the "mainline" revision spec.
1780 So, to find the merge proposal that reviewed line 1 of README:
1782 brz lp-find-proposal -r mainline:annotate:README:1
1784 brz lp-login
1787 Alias for "launchpad-login", see "brz launchpad-login".
1788 brz lp-logout
1790 Alias for "launchpad-logout", see "brz launchpad-logout".
1791 brz lp-open
1793 Alias for "launchpad-open", see "brz launchpad-open".
1794 brz ls [PATH]
1796 Options:
1797 --directory ARG, -d Branch to operate on, instead of working
1798 directory.
1799 --from-root Print paths relative to the root of the
1800 branch.
1801 --help, -h Show help message.
1802 --ignored, -i Print ignored files.
1803 --kind ARG, -k List entries of a particular kind: file,
1804 directory, symlink, tree-reference.
1805 --null, -0 Use an ASCII NUL (\0) separator rather
1806 than a newline.
1807 --quiet, -q Only display errors and warnings.
1808 --recursive, -R Recurse into subdirectories.
1809 --revision ARG, -r See "help revisionspec" for details.
1810 --show-ids Show internal object ids.
1811 --unknown, -u Print unknown files.
1812 --usage Show usage message and options.
1813 --verbose, -v Display more information.
1814 --versioned, -V Print versioned files.
1815 See also: cat, status
1817 List files in a tree.
1819 brz merge [LOCATION]
1823 Options:
1824 --change ARG, -c Select changes introduced by the
1825 specified revision. See also "help
1826 revisionspec".
1827 --directory ARG, -d Branch to merge into, rather than the
1828 one containing the working directory.
1829 --force Merge even if the destination tree has
1830 uncommitted changes.
1831 --help, -h Show help message.
1832 --interactive, -i Select changes interactively.
1833 --merge-type ARG Select a particular merge algorithm.
1834 --diff3 Merge using external diff3.
1835 --lca LCA-newness merge.
1836 --merge3 Native diff3-style merge.
1837 --weave Weave-based merge.
1838 --preview Instead of merging, show a diff of the
1839 merge.
1840 --pull If the destination is already completely
1841 merged into the source, pull from the
1842 source rather than merging. When this
1843 happens, you do not need to commit the
1844 result.
1845 --quiet, -q Only display errors and warnings.
1846 --remember Remember the specified location as a
1847 default.
1848 --reprocess Reprocess to reduce spurious conflicts.
1849 --revision ARG, -r See "help revisionspec" for details.
1850 --show-base Show base revision text in conflicts.
1851 --uncommitted Apply uncommitted changes from a working
1852 copy, instead of branch changes.
1853 --usage Show usage message and options.
1854 --verbose, -v Display more information.
1855 See also: remerge, send, status-flags, update
1857 Perform a three-way merge.
1859 The source of the merge can be specified either in the form of a
1861 branch, or in the form of a path to a file containing a merge directive
1862 generated with brz send. If neither is specified, the default is the
1863 upstream branch or the branch most recently merged using --remember.
1864 The source of the merge may also be specified in the form of a path to
1865 a file in another branch: in this case, only the modifications to that
1866 file are merged into the current working tree.
1867 When merging from a branch, by default brz will try to merge in all new
1869 work from the other branch, automatically determining an appropriate
1870 base revision. If this fails, you may need to give an explicit base.
1871 To pick a different ending revision, pass "--revision OTHER". brz will
1873 try to merge in all new work up to and including revision OTHER.
1874 If you specify two values, "--revision BASE..OTHER", only revisions
1876 BASE through OTHER, excluding BASE but including OTHER, will be merged.
1877 If this causes some revisions to be skipped, i.e. if the destination
1878 branch does not already contain revision BASE, such a merge is commonly
1879 referred to as a "cherrypick". Unlike a normal merge, Breezy does not
1880 currently track cherrypicks. The changes look like a normal commit, and
1881 the history of the changes from the other branch is not stored in the
1882 commit.
1883 Revision numbers are always relative to the source branch.
1885 Merge will do its best to combine the changes in two branches, but
1887 there are some kinds of problems only a human can fix. When it encoun‐
1888 ters those, it will mark a conflict. A conflict means that you need to
1889 fix something, before you can commit.
1890 Use brz resolve when you have fixed a problem. See also brz conflicts.
1892 If there is no default branch set, the first merge will set it (use
1894 --no-remember to avoid setting it). After that, you can omit the branch
1895 to use the default. To change the default, use --remember. The value
1896 will only be saved if the remote location can be accessed.
1897 The results of the merge are placed into the destination working direc‐
1899 tory, where they can be reviewed (with brz diff), tested, and then com‐
1900 mitted to record the result of the merge.
1901 merge refuses to run if there are any uncommitted changes, unless
1903 --force is given. If --force is given, then the changes from the
1904 source will be merged with the current working tree, including any un‐
1905 committed changes in the tree. The --force option can also be used to
1906 create a merge revision which has more than two parents.
1907 If one would like to merge changes from the working tree of the other
1909 branch without merging any committed revisions, the --uncommitted op‐
1910 tion can be given.
1911 To select only some changes to merge, use "merge -i", which will prompt
1913 you to apply each diff hunk and file change, similar to "shelve".
1914 Examples:
1916 To merge all new revisions from brz.dev:
1917 brz merge ../brz.dev
1919 To merge changes up to and including revision 82 from brz.dev:
1921 brz merge -r 82 ../brz.dev
1923 To merge the changes introduced by 82, without previous changes:
1925 brz merge -r 81..82 ../brz.dev
1927 To apply a merge directive contained in /tmp/merge:
1929 brz merge /tmp/merge
1931 To create a merge revision with three parents from two branches
1933 feature1a and feature1b:
1934 brz merge ../feature1a
1936 brz merge ../feature1b --force
1937 brz commit -m 'revision with three parents'
1938 brz missing [OTHER_BRANCH]
1941 Options:
1942 --directory ARG, -d Branch to operate on, instead of working
1943 directory.
1944 --help, -h Show help message.
1945 --include-merged Show all revisions in addition to the
1946 mainline ones.
1947 --log-format ARG Use specified log format.
1948 --gnu-changelog Format used by GNU ChangeLog files.
1949 --line Log format with one line per revision.
1950 --long Detailed log format.
1951 --short Moderately short log format.
1952 --mine-only Display changes in the local branch
1953 only.
1954 --my-revision ARG Filter on local branch revisions
1955 (inclusive). See "help revisionspec" for
1956 details.
1957 --other Same as --theirs-only.
1958 --quiet, -q Only display errors and warnings.
1959 --reverse Reverse the order of revisions.
1960 --revision ARG, -r Filter on other branch revisions
1961 (inclusive). See "help revisionspec" for
1962 details.
1963 --show-ids Show internal object ids.
1964 --theirs-only Display changes in the remote branch
1965 only.
1966 --this Same as --mine-only.
1967 --usage Show usage message and options.
1968 --verbose, -v Display more information.
1969 See also: merge, pull
1971 Show unmerged/unpulled revisions between two branches.
1973 OTHER_BRANCH may be local or remote.
1975 To filter on a range of revisions, you can use the command -r be‐
1977 gin..end -r revision requests a specific revision, -r ..end or -r be‐
1978 gin.. are also valid.
1979 Exit values:
1981 1 - some missing revisions
1982 0 - no missing revisions
1983 Examples:
1985 Determine the missing revisions between this and the branch at the
1987 remembered pull location:
1988 brz missing
1990 Determine the missing revisions between this and another branch:
1992 brz missing http://server/branch
1994 Determine the missing revisions up to a specific revision on the
1996 other
1997 branch:
1998 brz missing -r ..-10
2000 Determine the missing revisions up to a specific revision on this
2002 branch:
2003 brz missing --my-revision ..-10
2005 brz mkdir DIR...
2008 Options:
2009 --help, -h Show help message.
2010 --parents, -p No error if existing, make parent
2011 directories as needed.
2012 --quiet, -q Only display errors and warnings.
2013 --usage Show usage message and options.
2014 --verbose, -v Display more information.
2015 Create a new versioned directory.
2017 This is equivalent to creating the directory and then adding it.
2019 brz move
2022 Alias for "mv", see "brz mv".
2023 brz mv [NAMES...]
2025 Options:
2026 --after Move only the brz identifier of the
2027 file, because the file has already been
2028 moved.
2029 --auto Automatically guess renames.
2030 --dry-run Avoid making changes when guessing
2031 renames.
2032 --help, -h Show help message.
2033 --quiet, -q Only display errors and warnings.
2034 --usage Show usage message and options.
2035 --verbose, -v Display more information.
2036 Aliases: move, rename
2038 Move or rename a file.
2040 Usage:
2042 brz mv OLDNAME NEWNAME
2043 brz mv SOURCE... DESTINATION
2045 If the last argument is a versioned directory, all the other names are
2047 moved into it. Otherwise, there must be exactly two arguments and the
2048 file is changed to a new name.
2049 If OLDNAME does not exist on the filesystem but is versioned and NEW‐
2051 NAME does exist on the filesystem but is not versioned, mv assumes that
2052 the file has been manually moved and only updates its internal inven‐
2053 tory to reflect that change. The same is valid when moving many SOURCE
2054 files to a DESTINATION.
2055 Files cannot be moved between branches.
2057 brz nick [NICKNAME]
2060 Options:
2061 --directory ARG, -d Branch to operate on, instead of working
2062 directory.
2063 --help, -h Show help message.
2064 --quiet, -q Only display errors and warnings.
2065 --usage Show usage message and options.
2066 --verbose, -v Display more information.
2067 See also: info
2069 Print or set the branch nickname.
2071 If unset, the colocated branch name is used for colocated branches, and
2073 the branch directory name is used for other branches. To print the
2074 current nickname, execute with no argument.
2075 Bound branches use the nickname of its master branch unless it is set
2077 locally.
2078 brz pack [BRANCH_OR_REPO]
2081 Options:
2082 --clean-obsolete-packs Delete obsolete packs to save disk
2083 space.
2084 --help, -h Show help message.
2085 --quiet, -q Only display errors and warnings.
2086 --usage Show usage message and options.
2087 --verbose, -v Display more information.
2088 See also: repositories
2090 Compress the data within a repository.
2092 This operation compresses the data within a bazaar repository. As
2094 bazaar supports automatic packing of repository, this operation is nor‐
2095 mally not required to be done manually.
2096 During the pack operation, bazaar takes a backup of existing repository
2098 data, i.e. pack files. This backup is eventually removed by bazaar au‐
2099 tomatically when it is safe to do so. To save disk space by removing
2100 the backed up pack files, the --clean-obsolete-packs option may be
2101 used.
2102 Warning: If you use --clean-obsolete-packs and your machine crashes
2104 during or immediately after repacking, you may be left with a state
2105 where the deletion has been written to disk but the new packs have not
2106 been. In this case the repository may be unusable.
2107 brz patch [FILENAME]
2110 Options:
2111 --help, -h Show help message.
2112 --quiet, -q Only display errors and warnings.
2113 --silent Suppress chatter.
2114 --strip ARG, -p Strip the smallest prefix containing num
2115 leading slashes from filenames.
2116 --usage Show usage message and options.
2117 --verbose, -v Display more information.
2118 Apply a named patch to the current tree.
2120 brz ping LOCATION
2125 Options:
2126 --help, -h Show help message.
2127 --quiet, -q Only display errors and warnings.
2128 --usage Show usage message and options.
2129 --verbose, -v Display more information.
2130 Pings a Bazaar smart server.
2132 This command sends a 'hello' request to the given location using the
2134 brz smart protocol, and reports the response.
2135 brz plugins
2138 Options:
2139 --help, -h Show help message.
2140 --quiet, -q Only display errors and warnings.
2141 --usage Show usage message and options.
2142 --verbose, -v Display more information.
2143 List the installed plugins.
2145 This command displays the list of installed plugins including version
2147 of plugin and a short description of each.
2148 --verbose shows the path where each plugin is located.
2150 A plugin is an external component for Breezy that extends the revision
2152 control system, by adding or replacing code in Breezy. Plugins can do
2153 a variety of things, including overriding commands, adding new com‐
2154 mands, providing additional network transports and customizing log out‐
2155 put.
2156 See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plug‐
2158 ins/en/> for further information on plugins including where to find
2159 them and how to install them. Instructions are also provided there on
2160 how to write new plugins using the Python programming language.
2161 brz praise
2164 Alias for "annotate", see "brz annotate".
2165 brz pull [LOCATION]
2167 Options:
2168 --directory ARG, -d Branch to pull into, rather than the one
2169 containing the working directory.
2170 --help, -h Show help message.
2171 --local Perform a local pull in a bound branch.
2172 Local pulls are not applied to the
2173 master branch.
2174 --overwrite Ignore differences between branches and
2175 overwrite unconditionally.
2176 --overwrite-tags Overwrite tags only.
2177 --quiet, -q Only display errors and warnings.
2178 --remember Remember the specified location as a
2179 default.
2180 --revision ARG, -r See "help revisionspec" for details.
2181 --show-base Show base revision text in conflicts.
2182 --usage Show usage message and options.
2183 --verbose, -v Show logs of pulled revisions.
2184 See also: push, send, status-flags, update
2186 Turn this branch into a mirror of another branch.
2188 By default, this command only works on branches that have not diverged.
2190 Branches are considered diverged if the destination branch's most re‐
2191 cent commit is one that has not been merged (directly or indirectly)
2192 into the parent.
2193 If branches have diverged, you can use 'brz merge' to integrate the
2195 changes from one into the other. Once one branch has merged, the other
2196 should be able to pull it again.
2197 If you want to replace your local changes and just want your branch to
2199 match the remote one, use pull --overwrite. This will work even if the
2200 two branches have diverged.
2201 If there is no default location set, the first pull will set it (use
2203 --no-remember to avoid setting it). After that, you can omit the loca‐
2204 tion to use the default. To change the default, use --remember. The
2205 value will only be saved if the remote location can be accessed.
2206 The --verbose option will display the revisions pulled using the
2208 log_format configuration option. You can use a different format by
2209 overriding it with -Olog_format=<other_format>.
2210 Note: The location can be specified either in the form of a branch, or
2212 in the form of a path to a file containing a merge directive generated
2213 with brz send.
2214 brz push [LOCATION]
2217 Options:
2218 --create-prefix Create the path leading up to the branch
2219 if it does not already exist.
2220 --directory ARG, -d Branch to push from, rather than the one
2221 containing the working directory.
2222 --help, -h Show help message.
2223 --lossy Allow lossy push, i.e. dropping metadata
2224 that can't be represented in the target.
2225 --no-tree Don't populate the working tree, even
2226 for protocols that support it.
2227 --overwrite Ignore differences between branches and
2228 overwrite unconditionally.
2229 --overwrite-tags Overwrite tags only.
2230 --quiet, -q Only display errors and warnings.
2231 --remember Remember the specified location as a
2232 default.
2233 --revision ARG, -r See "help revisionspec" for details.
2234 --stacked Create a stacked branch that references
2235 the public location of the parent
2236 branch.
2237 --stacked-on ARG Create a stacked branch that refers to
2238 another branch for the commit history.
2239 Only the work not present in the
2240 referenced branch is included in the
2241 branch created.
2242 --strict Refuse to push if there are uncommitted
2243 changes in the working tree, --no-strict
2244 disables the check.
2245 --usage Show usage message and options.
2246 --use-existing-dir By default push will fail if the target
2247 directory exists, but does not already
2248 have a control directory. This flag
2249 will allow push to proceed.
2250 --verbose, -v Display more information.
2251 See also: pull, update, working-trees
2253 Update a mirror of this branch.
2255 The target branch will not have its working tree populated because this
2257 is both expensive, and is not supported on remote file systems.
2258 Some smart servers or protocols *may* put the working tree in place in
2260 the future.
2261 This command only works on branches that have not diverged. Branches
2263 are considered diverged if the destination branch's most recent commit
2264 is one that has not been merged (directly or indirectly) by the source
2265 branch.
2266 If branches have diverged, you can use 'brz push --overwrite' to re‐
2268 place the other branch completely, discarding its unmerged changes.
2269 If you want to ensure you have the different changes in the other
2271 branch, do a merge (see brz help merge) from the other branch, and com‐
2272 mit that. After that you will be able to do a push without '--over‐
2273 write'.
2274 If there is no default push location set, the first push will set it
2276 (use --no-remember to avoid setting it). After that, you can omit the
2277 location to use the default. To change the default, use --remember.
2278 The value will only be saved if the remote location can be accessed.
2279 The --verbose option will display the revisions pushed using the
2281 log_format configuration option. You can use a different format by
2282 overriding it with -Olog_format=<other_format>.
2283 brz reconcile [BRANCH]
2286 Options:
2287 --help, -h Show help message.
2288 --quiet, -q Only display errors and warnings.
2289 --usage Show usage message and options.
2290 --verbose, -v Display more information.
2291 See also: check
2293 Reconcile brz metadata in a branch.
2295 This can correct data mismatches that may have been caused by previous
2297 ghost operations or brz upgrades. You should only need to run this com‐
2298 mand if 'brz check' or a brz developer advises you to run it.
2299 If a second branch is provided, cross-branch reconciliation is also at‐
2301 tempted, which will check that data like the tree root id which was not
2302 present in very early brz versions is represented correctly in both
2303 branches.
2304 At the same time it is run it may recompress data resulting in a poten‐
2306 tial saving in disk space or performance gain.
2307 The branch *MUST* be on a listable system such as local disk or sftp.
2309 brz reconfigure [LOCATION]
2312 Options:
2313 --bind-to ARG Branch to bind checkout to.
2314 --force Perform reconfiguration even if local
2315 changes will be lost.
2316 --help, -h Show help message.
2317 --quiet, -q Only display errors and warnings.
2318 --repository_trees ARG Whether new branches in the repository
2319 have trees.
2320 --with-no-trees Reconfigure repository to not create
2321 working trees on branches by default.
2322 --with-trees Reconfigure repository to create working
2323 trees on branches by default.
2324 --repository_type ARG Location fo the repository.
2325 --standalone Reconfigure to be a standalone branch
2326 (i.e. stop using shared repository).
2327 --use-shared Reconfigure to use a shared repository.
2328 --stacked-on ARG Reconfigure a branch to be stacked on
2329 another branch.
2330 --tree_type ARG The relation between branch and tree.
2331 --branch Reconfigure to be an unbound branch with
2332 no working tree.
2333 --checkout Reconfigure to be a bound branch with a
2334 working tree.
2335 --lightweight-checkout Reconfigure to be a lightweight checkout
2336 (with no local history).
2337 --tree Reconfigure to be an unbound branch with
2338 a working tree.
2339 --unstacked Reconfigure a branch to be unstacked.
2340 This may require copying substantial
2341 data into it.
2342 --usage Show usage message and options.
2343 --verbose, -v Display more information.
2344 See also: branches, checkouts, standalone-trees, working-trees
2346 Reconfigure the type of a brz directory.
2348 A target configuration must be specified.
2350 For checkouts, the bind-to location will be auto-detected if not speci‐
2352 fied. The order of preference is 1. For a lightweight checkout, the
2353 current bound location. 2. For branches that used to be checkouts, the
2354 previously-bound location. 3. The push location. 4. The parent loca‐
2355 tion. If none of these is available, --bind-to must be specified.
2356 brz remerge [FILE...]
2359 Options:
2360 --help, -h Show help message.
2361 --merge-type ARG Select a particular merge algorithm.
2362 --diff3 Merge using external diff3.
2363 --lca LCA-newness merge.
2364 --merge3 Native diff3-style merge.
2365 --weave Weave-based merge.
2366 --quiet, -q Only display errors and warnings.
2367 --reprocess Reprocess to reduce spurious conflicts.
2368 --show-base Show base revision text in conflicts.
2369 --usage Show usage message and options.
2370 --verbose, -v Display more information.
2371 Redo a merge.
2373 Use this if you want to try a different merge technique while resolving
2375 conflicts. Some merge techniques are better than others, and remerge
2376 lets you try different ones on different files.
2377 The options for remerge have the same meaning and defaults as the ones
2379 for merge. The difference is that remerge can (only) be run when there
2380 is a pending merge, and it lets you specify particular files.
2381 Examples:
2383 Re-do the merge of all conflicted files, and show the base text in
2384 conflict regions, in addition to the usual THIS and OTHER texts:
2385 brz remerge --show-base
2387 Re-do the merge of "foobar", using the weave merge algorithm, with
2389 additional processing to reduce the size of conflict regions:
2390 brz remerge --merge-type weave --reprocess foobar
2392 brz remove [FILE...]
2395 Options:
2396 --file-deletion-strategy ARGThe file deletion mode to be used.
2397 --keep Delete from brz but leave the working
2398 copy.
2399 --no-backup Don't backup changed files.
2400 --safe Backup changed files (default).
2401 --help, -h Show help message.
2402 --new Only remove files that have never been
2403 committed.
2404 --quiet, -q Only display errors and warnings.
2405 --usage Show usage message and options.
2406 --verbose, -v Display more information.
2407 Aliases: rm, del
2409 Remove files or directories.
2411 This makes Breezy stop tracking changes to the specified files. Breezy
2413 will delete them if they can easily be recovered using revert otherwise
2414 they will be backed up (adding an extension of the form .~#~). If no
2415 options or parameters are given Breezy will scan for files that are be‐
2416 ing tracked by Breezy but missing in your tree and stop tracking them
2417 for you.
2418 brz remove-branch [LOCATION]
2421 Options:
2422 --directory ARG, -d Branch to operate on, instead of working
2423 directory.
2424 --force Remove branch even if it is the active
2425 branch.
2426 --help, -h Show help message.
2427 --quiet, -q Only display errors and warnings.
2428 --usage Show usage message and options.
2429 --verbose, -v Display more information.
2430 Alias: rmbranch
2432 Remove a branch.
2434 This will remove the branch from the specified location but will keep
2436 any working tree or repository in place.
2437 Examples:
2439 Remove the branch at repo/trunk:
2441 brz remove-branch repo/trunk
2443 brz remove-tree [LOCATION...]
2446 Options:
2447 --force Remove the working tree even if it has
2448 uncommitted or shelved changes.
2449 --help, -h Show help message.
2450 --quiet, -q Only display errors and warnings.
2451 --usage Show usage message and options.
2452 --verbose, -v Display more information.
2453 See also: checkout, working-trees
2455 Remove the working tree from a given branch/checkout.
2457 Since a lightweight checkout is little more than a working tree this
2459 will refuse to run against one.
2460 To re-create the working tree, use "brz checkout".
2462 brz rename
2465 Alias for "mv", see "brz mv".
2466 brz renames [DIR]
2468 Options:
2469 --help, -h Show help message.
2470 --quiet, -q Only display errors and warnings.
2471 --usage Show usage message and options.
2472 --verbose, -v Display more information.
2473 See also: status
2475 Show list of renamed files.
2477 brz resolve [FILE...]
2481 Options:
2482 --action ARG How to resolve the conflict.
2483 --auto Detect whether conflict has been
2484 resolved by user.
2485 --done Marks the conflict as resolved.
2486 --take-other Resolve the conflict taking the merged
2487 version into account.
2488 --take-this Resolve the conflict preserving the
2489 version in the working tree.
2490 --all Resolve all conflicts in this tree.
2491 --directory ARG, -d Branch to operate on, instead of working
2492 directory.
2493 --help, -h Show help message.
2494 --quiet, -q Only display errors and warnings.
2495 --usage Show usage message and options.
2496 --verbose, -v Display more information.
2497 Alias: resolved
2499 See also: conflicts
2501 Mark a conflict as resolved.
2503 Merge will do its best to combine the changes in two branches, but
2505 there are some kinds of problems only a human can fix. When it encoun‐
2506 ters those, it will mark a conflict. A conflict means that you need to
2507 fix something, before you can commit.
2508 Once you have fixed a problem, use "brz resolve" to automatically mark
2510 text conflicts as fixed, "brz resolve FILE" to mark a specific conflict
2511 as resolved, or "brz resolve --all" to mark all conflicts as resolved.
2512 brz resolved
2515 Alias for "resolve", see "brz resolve".
2516 brz revert [FILE...]
2518 Options:
2519 --forget-merges Remove pending merge marker, without
2520 changing any files.
2521 --help, -h Show help message.
2522 --no-backup Do not save backups of reverted files.
2523 --quiet, -q Only display errors and warnings.
2524 --revision ARG, -r See "help revisionspec" for details.
2525 --usage Show usage message and options.
2526 --verbose, -v Display more information.
2527 See also: cat, export, merge, shelve
2529 Set files in the working tree back to the contents of a previous revi‐
2531 sion.
2532 Giving a list of files will revert only those files. Otherwise, all
2534 files will be reverted. If the revision is not specified with '--revi‐
2535 sion', the working tree basis revision is used. A revert operation af‐
2536 fects only the working tree, not any revision history like the branch
2537 and repository or the working tree basis revision.
2538 To remove only some changes, without reverting to a prior version, use
2540 merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
2541 will remove the changes introduced by the second last commit (-2),
2542 without affecting the changes introduced by the last commit (-1). To
2543 remove certain changes on a hunk-by-hunk basis, see the shelve command.
2544 To update the branch to a specific revision or the latest revision and
2545 update the working tree accordingly while preserving local changes, see
2546 the update command.
2547 Uncommitted changes to files that are reverted will be discarded. How‐
2549 ever, by default, any files that have been manually changed will be
2550 backed up first. (Files changed only by merge are not backed up.)
2551 Backup files have '.~#~' appended to their name, where # is a number.
2552 When you provide files, you can use their current pathname or the path‐
2554 name from the target revision. So you can use revert to "undelete" a
2555 file by name. If you name a directory, all the contents of that direc‐
2556 tory will be reverted.
2557 If you have newly added files since the target revision, they will be
2559 removed. If the files to be removed have been changed, backups will be
2560 created as above. Directories containing unknown files will not be
2561 deleted.
2562 The working tree contains a list of revisions that have been merged but
2564 not yet committed. These revisions will be included as additional par‐
2565 ents of the next commit. Normally, using revert clears that list as
2566 well as reverting the files. If any files are specified, revert leaves
2567 the list of uncommitted merges alone and reverts only the files. Use
2568 \*(Aq\*(Aqbrz revert.\*(Aq\*(Aq in the tree root to revert all files
2569 but keep the recorded merges, and \*(Aq\*(Aqbrz revert --for‐
2570 get-merges\*(Aq\*(Aq to clear the pending merge list without reverting
2571 any files.
2572 Using "brz revert --forget-merges", it is possible to apply all of the
2574 changes from a branch in a single revision. To do this, perform the
2575 merge as desired. Then doing revert with the "--forget-merges" option
2576 will keep the content of the tree as it was, but it will clear the list
2577 of pending merges. The next commit will then contain all of the
2578 changes that are present in the other branch, but without any other
2579 parent revisions. Because this technique forgets where these changes
2580 originated, it may cause additional conflicts on later merges involving
2581 the same source and target branches.
2582 brz revno [LOCATION]
2585 Options:
2586 --help, -h Show help message.
2587 --quiet, -q Only display errors and warnings.
2588 --revision ARG, -r See "help revisionspec" for details.
2589 --tree Show revno of working tree.
2590 --usage Show usage message and options.
2591 --verbose, -v Display more information.
2592 See also: info
2594 Show current revision number.
2596 This is equal to the number of revisions on this branch.
2598 brz rm
2601 Alias for "remove", see "brz remove".
2602 brz rmbranch
2604 Alias for "remove-branch", see "brz remove-branch".
2605 brz root [FILENAME]
2607 Options:
2608 --help, -h Show help message.
2609 --quiet, -q Only display errors and warnings.
2610 --usage Show usage message and options.
2611 --verbose, -v Display more information.
2612 Show the tree root directory.
2614 The root is the nearest enclosing directory with a control directory.
2616 brz send [SUBMIT_BRANCH] [PUBLIC_BRANCH]
2619 Options:
2620 --body ARG Body for the email.
2621 --format ARG Use the specified output format.
2622 --from ARG, -f Branch to generate the submission from,
2623 rather than the one containing the
2624 working directory.
2625 --help, -h Show help message.
2626 --mail-to ARG Mail the request to this address.
2627 --message ARG, -m Message string.
2628 --no-bundle Do not include a bundle in the merge
2629 directive.
2630 --no-patch Do not include a preview patch in the
2631 merge directive.
2632 --output ARG, -o Write merge directive to this file or
2633 directory; use - for stdout.
2634 --quiet, -q Only display errors and warnings.
2635 --remember Remember submit and public branch.
2636 --revision ARG, -r See "help revisionspec" for details.
2637 --strict Refuse to send if there are uncommitted
2638 changes in the working tree, --no-strict
2639 disables the check.
2640 --usage Show usage message and options.
2641 --verbose, -v Display more information.
2642 See also: merge, pull
2644 Mail or create a merge-directive for submitting changes.
2646 A merge directive provides many things needed for requesting merges:
2648 * A machine-readable description of the merge to perform
2650 * An optional patch that is a preview of the changes requested
2652 * An optional bundle of revision data, so that the changes can be ap‐
2654 plied
2655 directly from the merge directive, without retrieving data from a
2656 branch.
2657 \*(Aqbrz send\*(Aq creates a compact data set that, when applied using
2659 brz merge, has the same effect as merging from the source branch.
2660 By default the merge directive is self-contained and can be applied to
2662 any branch containing submit_branch in its ancestory without needing
2663 access to the source branch.
2664 If --no-bundle is specified, then Breezy doesn't send the contents of
2666 the revisions, but only a structured request to merge from the pub‐
2667 lic_location. In that case the public_branch is needed and it must be
2668 up-to-date and accessible to the recipient. The public_branch is al‐
2669 ways included if known, so that people can check it later.
2670 The submit branch defaults to the parent of the source branch, but can
2672 be overridden. Both submit branch and public branch will be remembered
2673 in branch.conf the first time they are used for a particular branch.
2674 The source branch defaults to that containing the working directory,
2675 but can be changed using --from.
2676 Both the submit branch and the public branch follow the usual behavior
2678 with respect to --remember: If there is no default location set, the
2679 first send will set it (use --no-remember to avoid setting it). After
2680 that, you can omit the location to use the default. To change the de‐
2681 fault, use --remember. The value will only be saved if the location can
2682 be accessed.
2683 In order to calculate those changes, brz must analyse the submit
2685 branch. Therefore it is most efficient for the submit branch to be a
2686 local mirror. If a public location is known for the submit_branch,
2687 that location is used in the merge directive.
2688 The default behaviour is to send the merge directive by mail, unless -o
2690 is given, in which case it is sent to a file.
2691 Mail is sent using your preferred mail program. This should be trans‐
2693 parent on Windows (it uses MAPI). On Unix, it requires the xdg-email
2694 utility. If the preferred client can't be found (or used), your editor
2695 will be used.
2696 To use a specific mail program, set the mail_client configuration op‐
2698 tion. Supported values for specific clients are "claws", "evolution",
2699 "kmail", "mail.app" (MacOS X's Mail.app), "mutt", and "thunderbird";
2700 generic options are "default", "editor", "emacsclient", "mapi", and
2701 "xdg-email". Plugins may also add supported clients.
2702 If mail is being sent, a to address is required. This can be supplied
2704 either on the commandline, by setting the submit_to configuration op‐
2705 tion in the branch itself or the child_submit_to configuration option
2706 in the submit branch.
2707 The merge directives created by brz send may be applied using brz merge
2709 or brz pull by specifying a file containing a merge directive as the
2710 location.
2711 brz send makes extensive use of public locations to map local locations
2713 into URLs that can be used by other people. See \*(Aqbrz help configu‐
2714 ration\*(Aq to set them, and use \*(Aqbrz info\*(Aq to display them.
2715 brz serve
2718 Options:
2719 --allow-writes By default the server is a readonly
2720 server. Supplying --allow-writes
2721 enables write access to the contents of
2722 the served directory and below. Note
2723 that \*(Aq\*(Aqbrz serve\*(Aq\*(Aq does
2724 not perform
2725 authentication, so unless some form of
2726 external authentication is arranged
2727 supplying this option leads to global
2728 uncontrolled write access to your file
2729 system.
2730 --client-timeout ARG Override the default idle client timeout
2731 (5min).
2732 --directory ARG, -d Serve contents of this directory.
2733 --help, -h Show help message.
2734 --inet Serve on stdin/out for use from inetd or
2735 sshd.
2736 --listen ARG Listen for connections on nominated
2737 address.
2738 --port ARG Listen for connections on nominated
2739 port. Passing 0 as the port number will
2740 result in a dynamically allocated port.
2741 The default port depends on the
2742 protocol.
2743 --protocol ARG Protocol to serve.
2744 --bzr The Bazaar smart server protocol over
2745 TCP. (default port: 4155)
2746 --git Git Smart server protocol over TCP.
2747 (default port: 9418)
2748 --git-receive-pack Git Smart server receive pack command.
2749 (inetd mode only)
2750 --git-upload-pack Git Smart server upload pack command.
2751 (inetd mode only)
2752 --quiet, -q Only display errors and warnings.
2753 --usage Show usage message and options.
2754 --verbose, -v Display more information.
2755 Alias: server
2757 Run the brz server.
2759 brz server
2762 Alias for "serve", see "brz serve".
2763 brz shelve [FILE...]
2765 Options:
2766 --all Shelve all changes.
2767 --destroy Destroy removed changes instead of
2768 shelving them.
2769 --directory ARG, -d Branch to operate on, instead of working
2770 directory.
2771 --help, -h Show help message.
2772 --list List shelved changes.
2773 --message ARG, -m Message string.
2774 --quiet, -q Only display errors and warnings.
2775 --revision ARG, -r See "help revisionspec" for details.
2776 --usage Show usage message and options.
2777 --verbose, -v Display more information.
2778 --writer ARG Method to use for writing diffs.
2779 --plain Plaintext diff output.
2780 See also: configuration, unshelve
2782 Temporarily set aside some changes from the current tree.
2784 Shelve allows you to temporarily put changes you've made "on the
2786 shelf", ie. out of the way, until a later time when you can bring them
2787 back from the shelf with the 'unshelve' command. The changes are
2788 stored alongside your working tree, and so they aren't propagated along
2789 with your branch nor will they survive its deletion.
2790 If shelve --list is specified, previously-shelved changes are listed.
2792 Shelve is intended to help separate several sets of changes that have
2794 been inappropriately mingled. If you just want to get rid of all
2795 changes and you don't need to restore them later, use revert. If you
2796 want to shelve all text changes at once, use shelve --all.
2797 If filenames are specified, only the changes to those files will be
2799 shelved. Other files will be left untouched.
2800 If a revision is specified, changes since that revision will be
2802 shelved.
2803 You can put multiple items on the shelf, and by default, 'unshelve'
2805 will restore the most recently shelved changes.
2806 For complicated changes, it is possible to edit the changes in a sepa‐
2808 rate editor program to decide what the file remaining in the working
2809 copy should look like. To do this, add the configuration option
2810 change_editor = PROGRAM {new_path} {old_path}
2812 where {new_path} is replaced with the path of the new version of the
2814 file and {old_path} is replaced with the path of the old version of the
2815 file. The PROGRAM should save the new file with the desired contents
2816 of the file in the working tree.
2817 brz sign-my-commits [LOCATION] [COMMITTER]
2820 Options:
2821 --dry-run Don't actually sign anything, just print
2822 the revisions that would be signed.
2823 --help, -h Show help message.
2824 --quiet, -q Only display errors and warnings.
2825 --usage Show usage message and options.
2826 --verbose, -v Display more information.
2827 Sign all commits by a given committer.
2829 If location is not specified the local tree is used. If committer is
2831 not specified the default committer is used.
2832 This does not sign commits that already have signatures.
2834 brz split TREE
2837 Options:
2838 --help, -h Show help message.
2839 --quiet, -q Only display errors and warnings.
2840 --usage Show usage message and options.
2841 --verbose, -v Display more information.
2842 See also: join
2844 Split a subdirectory of a tree into a separate tree.
2846 This command will produce a target tree in a format that supports rich
2848 roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
2849 converted into earlier formats like 'dirstate-tags'.
2850 The TREE argument should be a subdirectory of a working tree. That
2852 subdirectory will be converted into an independent tree, with its own
2853 branch. Commits in the top-level tree will not apply to the new sub‐
2854 tree.
2855 brz st
2858 Alias for "status", see "brz status".
2859 brz stat
2861 Alias for "status", see "brz status".
2862 brz status [FILE...]
2864 Options:
2865 --change ARG, -c Select changes introduced by the
2866 specified revision. See also "help
2867 revisionspec".
2868 --help, -h Show help message.
2869 --no-classify Do not mark object type using indicator.
2870 --no-pending Don't show pending merges.
2871 --quiet, -q Only display errors and warnings.
2872 --revision ARG, -r See "help revisionspec" for details.
2873 --short, -S Use short status indicators.
2874 --show-ids Show internal object ids.
2875 --usage Show usage message and options.
2876 --verbose, -v Display more information.
2877 --versioned, -V Only show versioned files.
2878 Aliases: st, stat
2880 See also: diff, revert, status-flags
2882 Display status summary.
2884 This reports on versioned and unknown files, reporting them grouped by
2886 state. Possible states are:
2887 added
2889 Versioned in the working copy but not in the previous revision.
2890 removed
2892 Versioned in the previous revision but removed or deleted
2893 in the working copy.
2894 renamed
2896 Path of this file changed from the previous revision;
2897 the text may also have changed. This includes files whose
2898 parent directory was renamed.
2899 modified
2901 Text has changed since the previous revision.
2902 kind changed
2904 File kind has been changed (e.g. from file to directory).
2905 unknown
2907 Not versioned and not matching an ignore pattern.
2908 Additionally for directories, symlinks and files with a changed exe‐
2910 cutable bit, Breezy indicates their type using a trailing character:
2911 '/', '@' or '*' respectively. These decorations can be disabled using
2912 the '--no-classify' option.
2913 To see ignored files use 'brz ignored'. For details on the changes to
2915 file texts, use 'brz diff'.
2916 Note that --short or -S gives status flags for each item, similar to
2918 Subversion's status command. To get output similar to svn -q, use brz
2919 status -SV.
2920 If no arguments are specified, the status of the entire working direc‐
2922 tory is shown. Otherwise, only the status of the specified files or
2923 directories is reported. If a directory is given, status is reported
2924 for everything inside that directory.
2925 Before merges are committed, the pending merge tip revisions are shown.
2927 To see all pending merge revisions, use the -v option. To skip the
2928 display of pending merge information altogether, use the no-pending op‐
2929 tion or specify a file/directory.
2930 To compare the working directory to a specific revision, pass a single
2932 revision to the revision argument.
2933 To see which files have changed in a specific revision, or between two
2935 revisions, pass a revision range to the revision argument. This will
2936 produce the same results as calling 'brz diff --summarize'.
2937 brz switch [TO_LOCATION]
2940 Options:
2941 --create-branch, -b Create the target branch from this one
2942 before switching to it.
2943 --directory ARG, -d Branch to operate on, instead of working
2944 directory.
2945 --force Switch even if local commits will be
2946 lost.
2947 --help, -h Show help message.
2948 --quiet, -q Only display errors and warnings.
2949 --revision ARG, -r See "help revisionspec" for details.
2950 --store Store and restore uncommitted changes in
2951 the branch.
2952 --usage Show usage message and options.
2953 --verbose, -v Display more information.
2954 Set the branch of a checkout and update.
2956 For lightweight checkouts, this changes the branch being referenced.
2958 For heavyweight checkouts, this checks that there are no local commits
2959 versus the current bound branch, then it makes the local branch a mir‐
2960 ror of the new location and binds to it.
2961 In both cases, the working tree is updated and uncommitted changes are
2963 merged. The user can commit or revert these as they desire.
2964 Pending merges need to be committed or reverted before using switch.
2966 The path to the branch to switch to can be specified relative to the
2968 parent directory of the current branch. For example, if you are cur‐
2969 rently in a checkout of /path/to/branch, specifying 'newbranch' will
2970 find a branch at /path/to/newbranch.
2971 Bound branches use the nickname of its master branch unless it is set
2973 locally, in which case switching will update the local nickname to be
2974 that of the master.
2975 brz tag [TAG_NAME]
2978 Options:
2979 --delete Delete this tag rather than placing it.
2980 --directory ARG, -d Branch in which to place the tag.
2981 --force Replace existing tags.
2982 --help, -h Show help message.
2983 --quiet, -q Only display errors and warnings.
2984 --revision ARG, -r See "help revisionspec" for details.
2985 --usage Show usage message and options.
2986 --verbose, -v Display more information.
2987 See also: commit, tags
2989 Create, remove or modify a tag naming a revision.
2991 Tags give human-meaningful names to revisions. Commands that take a -r
2993 (--revision) option can be given -rtag:X, where X is any previously
2994 created tag.
2995 Tags are stored in the branch. Tags are copied from one branch to an‐
2997 other along when you branch, push, pull or merge.
2998 It is an error to give a tag name that already exists unless you pass
3000 --force, in which case the tag is moved to point to the new revision.
3001 To rename a tag (change the name but keep it on the same revsion), run
3003 \*(Aq\*(Aqbrz tag new-name -r tag:old-name\*(Aq\*(Aq and then
3004 \*(Aq\*(Aqbrz tag --delete oldname\*(Aq\*(Aq.
3005 If no tag name is specified it will be determined through the 'auto‐
3007 matic_tag_name' hook. This can e.g. be used to automatically tag up‐
3008 stream releases by reading configure.ac. See \*(Aq\*(Aqbrz help
3009 hooks\*(Aq\*(Aq for details.
3010 brz tags
3013 Options:
3014 --directory ARG, -d Branch whose tags should be displayed.
3015 --help, -h Show help message.
3016 --quiet, -q Only display errors and warnings.
3017 --revision ARG, -r See "help revisionspec" for details.
3018 --show-ids Show internal object ids.
3019 --sort ARG Sort tags by different criteria.
3020 --usage Show usage message and options.
3021 --verbose, -v Display more information.
3022 See also: tag
3024 List tags.
3026 This command shows a table of tag names and the revisions they refer‐
3028 ence.
3029 brz testament [BRANCH]
3032 Options:
3033 --help, -h Show help message.
3034 --long Produce long-format testament.
3035 --quiet, -q Only display errors and warnings.
3036 --revision ARG, -r See "help revisionspec" for details.
3037 --strict Produce a strict-format testament.
3038 --usage Show usage message and options.
3039 --verbose, -v Display more information.
3040 Show testament (signing-form) of a revision.
3042 brz unbind
3045 Options:
3046 --directory ARG, -d Branch to operate on, instead of working
3047 directory.
3048 --help, -h Show help message.
3049 --quiet, -q Only display errors and warnings.
3050 --usage Show usage message and options.
3051 --verbose, -v Display more information.
3052 See also: bind, checkouts
3054 Convert the current checkout into a regular branch.
3056 After unbinding, the local branch is considered independent and subse‐
3058 quent commits will be local only.
3059 brz uncommit [LOCATION]
3062 Options:
3063 --dry-run Don't actually make changes.
3064 --force Say yes to all questions.
3065 --help, -h Show help message.
3066 --keep-tags Keep tags that point to removed
3067 revisions.
3068 --local Only remove the commits from the local
3069 branch when in a checkout.
3070 --quiet, -q Only display errors and warnings.
3071 --revision ARG, -r See "help revisionspec" for details.
3072 --usage Show usage message and options.
3073 --verbose, -v Display more information.
3074 See also: commit
3076 Remove the last committed revision.
3078 --verbose will print out what is being removed. --dry-run will go
3080 through all the motions, but not actually remove anything.
3081 If --revision is specified, uncommit revisions to leave the branch at
3083 the specified revision. For example, "brz uncommit -r 15" will leave
3084 the branch at revision 15.
3085 Uncommit leaves the working tree ready for a new commit. The only
3087 change it may make is to restore any pending merges that were present
3088 before the commit.
3089 brz unshelve [SHELF_ID]
3092 Options:
3093 --action ARG The action to perform.
3094 --apply Apply changes and remove from the shelf.
3095 --delete-only Delete changes without applying them.
3096 --dry-run Show changes, but do not apply or remove
3097 them.
3098 --keep Apply changes but don't delete them.
3099 --preview Instead of unshelving the changes, show
3100 the diff that would result from
3101 unshelving.
3102 --directory ARG, -d Branch to operate on, instead of working
3103 directory.
3104 --help, -h Show help message.
3105 --quiet, -q Only display errors and warnings.
3106 --usage Show usage message and options.
3107 --verbose, -v Display more information.
3108 See also: shelve
3110 Restore shelved changes.
3112 By default, the most recently shelved changes are restored. However if
3114 you specify a shelf by id those changes will be restored instead. This
3115 works best when the changes don't depend on each other.
3116 brz up
3119 Alias for "update", see "brz update".
3120 brz update [DIR]
3122 Options:
3123 --help, -h Show help message.
3124 --quiet, -q Only display errors and warnings.
3125 --revision ARG, -r See "help revisionspec" for details.
3126 --show-base Show base revision text in conflicts.
3127 --usage Show usage message and options.
3128 --verbose, -v Display more information.
3129 Alias: up
3131 See also: pull, status-flags, working-trees
3133 Update a working tree to a new revision.
3135 This will perform a merge of the destination revision (the tip of the
3137 branch, or the specified revision) into the working tree, and then make
3138 that revision the basis revision for the working tree.
3139 You can use this to visit an older revision, or to update a working
3141 tree that is out of date from its branch.
3142 If there are any uncommitted changes in the tree, they will be carried
3144 across and remain as uncommitted changes after the update. To discard
3145 these changes, use 'brz revert'. The uncommitted changes may conflict
3146 with the changes brought in by the change in basis revision.
3147 If the tree's branch is bound to a master branch, brz will also update
3149 the branch from the master.
3150 You cannot update just a single file or directory, because each Breezy
3152 working tree has just a single basis revision. If you want to restore
3153 a file that has been removed locally, use 'brz revert' instead of 'brz
3154 update'. If you want to restore a file to its state in a previous re‐
3155 vision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
3156 out the old content of that file to a new location.
3157 The 'dir' argument, if given, must be the location of the root of a
3159 working tree to update. By default, the working tree that contains the
3160 current working directory is used.
3161 brz upgrade [URL]
3164 Options:
3165 --clean Remove the backup.bzr directory if
3166 successful.
3167 --dry-run Show what would be done, but don't
3168 actually do anything.
3169 --format ARG Upgrade to a specific format. See "brz
3170 help formats" for details.
3171 --2a Format for the bzr 2.0 series.
3172 --bzr Format for the bzr 2.0 series.
3173 --default Format for the bzr 2.0 series.
3174 --git GIT repository.
3175 --git-bare Bare GIT repository (no working tree).
3176 --help, -h Show help message.
3177 --quiet, -q Only display errors and warnings.
3178 --usage Show usage message and options.
3179 --verbose, -v Display more information.
3180 See also: check, formats, reconcile
3182 Upgrade a repository, branch or working tree to a newer format.
3184 When the default format has changed after a major new release of
3186 Bazaar/Breezy, you may be informed during certain operations that you
3187 should upgrade. Upgrading to a newer format may improve performance or
3188 make new features available. It may however limit interoperability with
3189 older repositories or with older versions of Bazaar or Breezy.
3190 If you wish to upgrade to a particular format rather than the current
3192 default, that can be specified using the --format option. As a conse‐
3193 quence, you can use the upgrade command this way to "downgrade" to an
3194 earlier format, though some conversions are a one way process (e.g.
3195 changing from the 1.x default to the 2.x default) so downgrading is not
3196 always possible.
3197 A backup.bzr.~#~ directory is created at the start of the conversion
3199 process (where # is a number). By default, this is left there on com‐
3200 pletion. If the conversion fails, delete the new .bzr directory and re‐
3201 name this one back in its place. Use the --clean option to ask for the
3202 backup.bzr directory to be removed on successful conversion. Alterna‐
3203 tively, you can delete it by hand if everything looks good afterwards.
3204 If the location given is a shared repository, dependent branches are
3206 also converted provided the repository converts successfully. If the
3207 conversion of a branch fails, remaining branches are still tried.
3208 For more information on upgrades, see the Breezy Upgrade Guide,
3210 https://www.breezy-vcs.org/doc/en/upgrade-guide/.
3211 brz verify-signatures [LOCATION]
3214 Options:
3215 --acceptable-keys ARG, -k Comma separated list of GPG key patterns
3216 which are acceptable for verification.
3217 --help, -h Show help message.
3218 --quiet, -q Only display errors and warnings.
3219 --revision ARG, -r See "help revisionspec" for details.
3220 --usage Show usage message and options.
3221 --verbose, -v Display more information.
3222 Verify all commit signatures.
3224 Verifies that all commits in the branch are signed by known GnuPG keys.
3226 brz version
3229 Options:
3230 --help, -h Show help message.
3231 --quiet, -q Only display errors and warnings.
3232 --short Print just the version number.
3233 --usage Show usage message and options.
3234 --verbose, -v Display more information.
3235 Show version of brz.
3237 brz version-info [LOCATION]
3240 Options:
3241 --all Include all possible information.
3242 --check-clean Check if tree is clean.
3243 --format ARG Select the output format.
3244 --custom Version info in Custom template-based
3245 format.
3246 --python Version info in Python format.
3247 --rio Version info in RIO (simple text) format
3248 (default).
3249 --help, -h Show help message.
3250 --include-file-revisions Include the last revision for each file.
3251 --include-history Include the revision-history.
3252 --quiet, -q Only display errors and warnings.
3253 --revision ARG, -r See "help revisionspec" for details.
3254 --template ARG Template for the output.
3255 --usage Show usage message and options.
3256 --verbose, -v Display more information.
3257 Show version information about this tree.
3259 You can use this command to add information about version into source
3261 code of an application. The output can be in one of the supported for‐
3262 mats or in a custom format based on a template.
3263 For example:
3265 brz version-info --custom \
3267 --template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n"
3268 will produce a C header file with formatted string containing the cur‐
3270 rent revision number. Other supported variables in templates are:
3271 * {date} - date of the last revision
3273 * {build_date} - current date
3274 * {revno} - revision number
3275 * {revision_id} - revision id
3276 * {branch_nick} - branch nickname
3277 * {clean} - 0 if the source tree contains uncommitted changes,
3278 otherwise 1
3279 brz view [FILE...]
3282 Options:
3283 --all Apply list or delete action to all
3284 views.
3285 --delete Delete the view.
3286 --help, -h Show help message.
3287 --name ARG Name of the view to define, list or
3288 delete.
3289 --quiet, -q Only display errors and warnings.
3290 --switch ARG Name of the view to switch to.
3291 --usage Show usage message and options.
3292 --verbose, -v Display more information.
3293 Manage filtered views.
3295 Views provide a mask over the tree so that users can focus on a subset
3297 of a tree when doing their work. After creating a view, commands that
3298 support a list of files - status, diff, commit, etc - effectively have
3299 that list of files implicitly given each time. An explicit list of
3300 files can still be given but those files must be within the current
3301 view.
3302 In most cases, a view has a short life-span: it is created to make a
3304 selected change and is deleted once that change is committed. At other
3305 times, you may wish to create one or more named views and switch be‐
3306 tween them.
3307 To disable the current view without deleting it, you can switch to the
3309 pseudo view called \*(Aq\*(Aqoff\*(Aq\*(Aq. This can be useful when you
3310 need to see the whole tree for an operation or two (e.g. merge) but
3311 want to switch back to your view after that.
3312 Examples:
3314 To define the current view:
3315 brz view file1 dir1 ...
3317 To list the current view:
3319 brz view
3321 To delete the current view:
3323 brz view --delete
3325 To disable the current view without deleting it:
3327 brz view --switch off
3329 To define a named view and switch to it:
3331 brz view --name view-name file1 dir1 ...
3333 To list a named view:
3335 brz view --name view-name
3337 To delete a named view:
3339 brz view --name view-name --delete
3341 To switch to a named view:
3343 brz view --switch view-name
3345 To list all views defined:
3347 brz view --all
3349 To delete all views:
3351 brz view --delete --all
3353 brz whoami [NAME]
3356 Options:
3357 --branch Set identity for the current branch
3358 instead of globally.
3359 --directory ARG, -d Branch to operate on, instead of working
3360 directory.
3361 --email Display email address only.
3362 --help, -h Show help message.
3363 --quiet, -q Only display errors and warnings.
3364 --usage Show usage message and options.
3365 --verbose, -v Display more information.
3366 Show or set brz user id.
3368 Examples:
3370 Show the email of the current user:
3371 brz whoami --email
3373 Set the current user:
3375 brz whoami "Frank Chu <fchu@example.com>"
3377
3380 BRZPATH
3381 Path where brz is to look for shell plugin external commands.
3382 BRZ_EMAIL
3384 E-Mail address of the user. Overrides EMAIL.
3385 EMAIL E-Mail address of the user.
3387 BRZ_EDITOR
3389 Editor for editing commit messages. Overrides EDITOR.
3390 EDITOR Editor for editing commit messages.
3392 BRZ_PLUGIN_PATH
3394 Paths where brz should look for plugins.
3395 BRZ_DISABLE_PLUGINS
3397 Plugins that brz should not load.
3398 BRZ_PLUGINS_AT
3400 Plugins to load from a directory not in BRZ_PLUGIN_PATH.
3401 BRZ_HOME
3403 Directory holding breezy config dir. Overrides HOME.
3404 BRZ_HOME (Win32)
3406 Directory holding breezy config dir. Overrides APPDATA and HOME.
3407 BZR_REMOTE_PATH
3409 Full name of remote 'brz' command (for brz+ssh:// URLs).
3410 BRZ_SSH
3412 Path to SSH client, or one of paramiko, openssh, sshcorp, plink
3413 or lsh.
3414 BRZ_LOG
3416 Location of brz.log (use '/dev/null' to suppress log).
3417 BRZ_LOG (Win32)
3419 Location of brz.log (use 'NUL' to suppress log).
3420 BRZ_COLUMNS
3422 Override implicit terminal width.
3423 BRZ_CONCURRENCY
3425 Number of processes that can be run concurrently (selftest)
3426 BRZ_PROGRESS_BAR
3428 Override the progress display. Values are 'none' or 'text'.
3429 BRZ_PDB
3431 Control whether to launch a debugger on error.
3432 BRZ_SIGQUIT_PDB
3434 Control whether SIGQUIT behaves normally or invokes a breakin
3435 debugger.
3436 BRZ_TEXTUI_INPUT
3438 Force console input mode for prompts to line-based (instead of
3439 char-based).
3440
3442 ~/.config/breezy/breezy.conf
3443 Contains the user's default configuration. The section [DEFAULT]
3444 is used to define general configuration that will be applied ev‐
3445 erywhere. The section [ALIASES] can be used to create command
3446 aliases for commonly used options.
3447 A typical config file might look something like:
3449 [DEFAULT]
3451 email=John Doe <jdoe@isp.com>
3452 [ALIASES]
3453 commit = commit --strict
3454 log10 = log --short -r -10..-1
3455
3457 https://www.breezy-vcs.org/
34583.2.2 2023-01-18 brz(1)