Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changes between Version 24 and Version 25 of BazaarWorkflow


Ignore:
Timestamp:
2010-06-07T16:31:17Z (11 years ago)
Author:
Martin Decky
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • BazaarWorkflow

    v24 v25  
    2121
    2222{{{
    23 $ bzr branch bzr://bzr.helenos.org/head my_branch
     23$ bzr branch bzr://bzr.helenos.org/mainline my_branch
    2424}}}
    2525
     
    3535
    3636{{{
    37 my_branch$ bzr push --remember bzr+http://jermar@bzr.helenos.org/head
     37my_branch$ bzr push --remember bzr+http://jermar@bzr.helenos.org/mainline
    3838}}}
    3939
     
    6767With 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.
    6868
    69 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:
     69Therefore 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:
    7070
    7171{{{
    72 $ bzr branch bzr://bzr.helenos.org/head head-clone
     72$ bzr branch bzr://bzr.helenos.org/mainline mainline-clone
    7373}}}
    7474
     
    7676
    7777{{{
    78 $ cd head-clone
    79 head-clone$ bzr merge ../my_branch
    80 head-clone$ bzr commit -m "Merge FAT server improvements."
     78$ cd mainline-clone
     79mainline-clone$ bzr merge ../my_branch
     80mainline-clone$ bzr commit -m "Merge FAT server improvements."
    8181}}}
    8282
     
    8484
    8585{{{
    86 head-clone$ bzr push bzr+http://jermar@bzr.helenos.org/head
     86mainline-clone$ bzr push bzr+http://jermar@bzr.helenos.org/mainline
    8787}}}
    8888
     
    9494
    9595{{{
    96 my_branch$ bzr merge bzr://bzr.helenos.org/head
     96my_branch$ bzr merge bzr://bzr.helenos.org/mainline
    9797my_branch$ bzr commit -m "Merge mainline changes."
    9898}}}
     
    102102=== Keeping a Clone Around ===
    103103
    104 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:
     104It 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:
    105105
    106106{{{
    107 head-clone$ bzr pull
     107mainline-clone$ bzr pull
    108108}}}
    109109