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