Changes between Version 1 and Version 2 of BazaarWorkflow

Timestamp:

2009-08-16T18:26:54Z (15 years ago)

Author:

Jiri Svoboda

Comment:

Structured history

BazaarWorkflow

@@ -15 +15 @@
 {{{
 $ cd my_branch
-$ ...modify some files...
-$ bzr commit -m "Fixed crash when writing zero bytes to FAT."
+my_branch$ ...modify some files...
+my_branch$ bzr commit -m "Fixed crash when writing zero bytes to FAT."
 }}}
 
@@ -22 +22 @@
 
 {{{
-$ bzr push --remember bzr+http://jermar@bzr.helenos.org/head
+my_branch$ bzr push --remember bzr+http://jermar@bzr.helenos.org/head
 }}}
 
@@ -28 +28 @@
 
 {{{
-$ bzr push
+my_branch$ bzr push
 }}}
 
@@ -42 +42 @@
 
 == Structured History ==
+
+If your branch diverged from the mainline (i.e. somebody pushed to the main repository since you branched off), you cannot push anymore. You must merge the two branches. With merging, the order of arguments is significant. You must always ''merge your branch into the mainline'', never 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 your branch {{{my_branch}}} diverged from the mainline. We thus create a new branch {{{head_clone}}} which will be a clone of the mainline:
+
+{{{
+$ bzr branch bzr://bzr.helenos.org/head head_clone
+}}}
+
+Now go to the clone repository and merge your branch into it:
+
+{{{
+$ cd head_clone
+head_clone$ bzr merge ../my_branch
+}}}
+
+Now we can push from the clone to the main repository:
+
+{{{
+head_clone$ bzr push bzr+http://jermar@bzr.helenos.org/head
+}}}
+
+Finally let us sync our branch with the main repository:
+
+{{{
+head_clone$ cd ../my_branch
+my_branch$ bzr pull
+}}}