Changes between Version 14 and Version 15 of BazaarWorkflow

Timestamp:

2009-08-17T19:43:16Z (15 years ago)

Author:

Jiri Svoboda

Comment:

head-clone instead of head_clone

BazaarWorkflow

@@ -54 +54 @@
 With merging, the order of arguments is significant. In this case we want to ''merge your branch into the mainline'', not the other way around! How can you do this? With bazaar you can only merge to a local repository (you need to chdir into it), you cannot merge to a remote repository.
 
-Therefore we have to resort to a little trick. Suppose you have a branch {{{my_branch}}}. We create a new branch {{{head_clone}}} which will be a clone of the mainline:
+Therefore we have to resort to a little trick. Suppose you have a branch {{{my_branch}}}. We create a new branch {{{head-clone}}} which will be a clone of the mainline:
 
 {{{
-$ bzr branch bzr://bzr.helenos.org/head head_clone
+$ bzr branch bzr://bzr.helenos.org/head head-clone
 }}}
 
@@ -63 +63 @@
 
 {{{
-$ cd head_clone
-head_clone$ bzr merge ../my_branch
-head_clone$ bzr commit -m "Merge FAT server improvements."
+$ cd head-clone
+head-clone$ bzr merge ../my_branch
+head-clone$ bzr commit -m "Merge FAT server improvements."
 }}}
 
@@ -71 +71 @@
 
 {{{
-head_clone$ bzr push bzr+http://jermar@bzr.helenos.org/head
+head-clone$ bzr push bzr+http://jermar@bzr.helenos.org/head
 }}}
 
@@ -89 +89 @@
 === Keeping a Clone Around ===
 
-It is advisable to keep a clone (such as the {{{head_clone}}} repository mentioned above) around. You can keep it up to date by pulling from the main repository:
+It is advisable to keep a clone (such as the {{{head-clone}}} repository mentioned above) around. You can keep it up to date by pulling from the main repository:
 
 {{{
-head_clone$ bzr pull
+head-clone$ bzr pull
 }}}