Changes between Version 24 and Version 25 of BazaarWorkflow

Timestamp:

2010-06-07T16:31:17Z (14 years ago)

Author:

Martin Decky

Comment:

—

BazaarWorkflow

@@ -21 +21 @@
 
 {{{
-$ bzr branch bzr://bzr.helenos.org/head my_branch
+$ bzr branch bzr://bzr.helenos.org/mainline my_branch
 }}}
 
@@ -35 +35 @@
 
 {{{
-my_branch$ bzr push --remember bzr+http://jermar@bzr.helenos.org/head
+my_branch$ bzr push --remember bzr+http://jermar@bzr.helenos.org/mainline
 }}}
 
@@ -67 +67 @@
 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 {{{mainline-clone}}} which will be a clone of the mainline:
 
 {{{
-$ bzr branch bzr://bzr.helenos.org/head head-clone
+$ bzr branch bzr://bzr.helenos.org/mainline mainline-clone
 }}}
 
@@ -76 +76 @@
 
 {{{
-$ cd head-clone
-head-clone$ bzr merge ../my_branch
-head-clone$ bzr commit -m "Merge FAT server improvements."
+$ cd mainline-clone
+mainline-clone$ bzr merge ../my_branch
+mainline-clone$ bzr commit -m "Merge FAT server improvements."
 }}}
 
@@ -84 +84 @@
 
 {{{
-head-clone$ bzr push bzr+http://jermar@bzr.helenos.org/head
+mainline-clone$ bzr push bzr+http://jermar@bzr.helenos.org/mainline
 }}}
 
@@ -94 +94 @@
 
 {{{
-my_branch$ bzr merge bzr://bzr.helenos.org/head
+my_branch$ bzr merge bzr://bzr.helenos.org/mainline
 my_branch$ bzr commit -m "Merge mainline changes."
 }}}
@@ -102 +102 @@
 === 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 {{{mainline-clone}}} repository mentioned above) around. You can keep it up to date by pulling from the main repository:
 
 {{{
-head-clone$ bzr pull
+mainline-clone$ bzr pull
 }}}