Changes between Version 14 and Version 15 of BazaarWorkflow
- Timestamp:
- 2009-08-17T19:43:16Z (15 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
BazaarWorkflow
v14 v15 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. 55 55 56 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:56 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: 57 57 58 58 {{{ 59 $ bzr branch bzr://bzr.helenos.org/head head _clone59 $ bzr branch bzr://bzr.helenos.org/head head-clone 60 60 }}} 61 61 … … 63 63 64 64 {{{ 65 $ cd head _clone66 head _clone$ bzr merge ../my_branch67 head _clone$ bzr commit -m "Merge FAT server improvements."65 $ cd head-clone 66 head-clone$ bzr merge ../my_branch 67 head-clone$ bzr commit -m "Merge FAT server improvements." 68 68 }}} 69 69 … … 71 71 72 72 {{{ 73 head _clone$ bzr push bzr+http://jermar@bzr.helenos.org/head73 head-clone$ bzr push bzr+http://jermar@bzr.helenos.org/head 74 74 }}} 75 75 … … 89 89 === Keeping a Clone Around === 90 90 91 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:91 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: 92 92 93 93 {{{ 94 head _clone$ bzr pull94 head-clone$ bzr pull 95 95 }}} 96 96