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

Changes between Version 14 and Version 15 of BazaarWorkflow


Ignore:
Timestamp:
2009-08-17T19:43:16Z (10 years ago)
Author:
Jiri Svoboda
Comment:

head-clone instead of head_clone

Legend:

Unmodified
Added
Removed
Modified
  • BazaarWorkflow

    v14 v15  
    5454With 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.
    5555
    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:
     56Therefore 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:
    5757
    5858{{{
    59 $ bzr branch bzr://bzr.helenos.org/head head_clone
     59$ bzr branch bzr://bzr.helenos.org/head head-clone
    6060}}}
    6161
     
    6363
    6464{{{
    65 $ cd head_clone
    66 head_clone$ bzr merge ../my_branch
    67 head_clone$ bzr commit -m "Merge FAT server improvements."
     65$ cd head-clone
     66head-clone$ bzr merge ../my_branch
     67head-clone$ bzr commit -m "Merge FAT server improvements."
    6868}}}
    6969
     
    7171
    7272{{{
    73 head_clone$ bzr push bzr+http://jermar@bzr.helenos.org/head
     73head-clone$ bzr push bzr+http://jermar@bzr.helenos.org/head
    7474}}}
    7575
     
    8989=== Keeping a Clone Around ===
    9090
    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:
     91It 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:
    9292
    9393{{{
    94 head_clone$ bzr pull
     94head-clone$ bzr pull
    9595}}}
    9696