/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
------------------------------
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.