/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/en/user-guide/sending_changes.txt

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/sending_changes.txt
10
10
so his/her task branches could well be inaccessible when a gatekeeper
11
11
in another timezone wants to review or merge it.
12
12
 
13
 
Bazaar provides a neat feature to assist here: *merge directives*.
 
13
Breezy provides a neat feature to assist here: *merge directives*.
14
14
 
15
15
Understanding merge directives
16
16
------------------------------
42
42
``send`` without options will create a merge directive, fire up your email
43
43
tool and attach it, ready for you to add the explanatory text bit.
44
44
(See the online help for ``send`` and
45
 
`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_
 
45
`Configuration Settings <../user-reference/index.html#configuration-settings>`_
46
46
in the User Reference for further details on how to configure this.)
47
47
 
48
48
Most projects like people to add some explanation to the mail along with
56
56
given, the directive is written to stdout.  For example::
57
57
 
58
58
  cd X-fix-123
59
 
  bzr send -o ../fix-123.patch
 
59
  brz send -o ../fix-123.patch
60
60
 
61
61
 
62
62
Applying a merge directive
66
66
using the ``merge`` and ``pull`` commands.
67
67
 
68
68
They can also be useful when communicating with upstream projects
69
 
that don't use Bazaar. In particular, the preview of the overall
 
69
that don't use Breezy. In particular, the preview of the overall
70
70
change in a merge directive looks like a vanilla software patch, so
71
71
they can be applied using ``patch -p0`` for example.