/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/organizing_branches.txt

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 19:09:26 UTC
  • mfrom: (6622.1.36 breezy)
  • Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/organizing_branches.txt
14
14
(or ``checkout``) command to create the mirror.
15
15
For example::
16
16
 
17
 
  bzr init-repo PROJECT
 
17
  brz init-repo PROJECT
18
18
  cd PROJECT
19
 
  bzr branch bzr+ssh://centralhost/srv/bzr/PROJECT/trunk
 
19
  brz branch bzr+ssh://centralhost/srv/brz/PROJECT/trunk
20
20
 
21
21
Task branches
22
22
-------------
28
28
To create a task branch, use the ``branch`` command
29
29
against your mirror branch. For example::
30
30
 
31
 
  bzr branch trunk fix-123
 
31
  brz branch trunk fix-123
32
32
  cd fix-123
33
33
  (hack, hack, hack)
34
34
 
52
52
Use the ``pull`` command to do this::
53
53
 
54
54
  cd trunk
55
 
  bzr pull
 
55
  brz pull
56
56
 
57
57
Merging the latest trunk into a feature branch
58
58
----------------------------------------------
60
60
Use the ``merge`` command to do this::
61
61
 
62
62
  cd fix-123
63
 
  bzr merge
 
63
  brz merge
64
64
  (resolve any conflicts)
65
 
  bzr commit -m "merged trunk"
 
65
  brz commit -m "merged trunk"
66
66
 
67
67
Merging a feature into the trunk
68
68
--------------------------------
74
74
If your mirror is a checkout::
75
75
 
76
76
  cd trunk
77
 
  bzr update
78
 
  bzr merge ../fix-123
 
77
  brz update
 
78
  brz merge ../fix-123
79
79
  (resolve any conflicts)
80
 
  bzr commit -m "Fixed bug #123"
 
80
  brz commit -m "Fixed bug #123"
81
81
 
82
82
If your mirror is a branch::
83
83
 
84
84
  cd trunk
85
 
  bzr pull
86
 
  bzr merge ../fix-123
 
85
  brz pull
 
86
  brz merge ../fix-123
87
87
  (resolve any conflicts)
88
 
  bzr commit -m "Fixed bug #123"
89
 
  bzr push
 
88
  brz commit -m "Fixed bug #123"
 
89
  brz push
90
90
 
91
91
Backing up task branches
92
92
------------------------