Changes between Version 5 and Version 6 of BazaarWorkflow


Ignore:
Timestamp:
2009-08-16T19:32:40Z (15 years ago)
Author:
Jiri Svoboda
Comment:

Think twice.

Legend:

Unmodified
Added
Removed
Modified

  • BazaarWorkflow

    v5 v6  
    33This should help you to start using our new VCS, Bazaar. Please read this little guide carefully. Inappropriate use of Bazaar '''WILL''' make a mess in our repository. This page only documents ''how to use Bazaar with HelenOS''. If you are confused and want to know what happens behind the scenes, read the [wiki:BazaarTheory Bazaar Theory].
    44
    5 === Linear History ===
     5== Linear History ==
    66
    77If you are doing a simple change (or several simple, unrelated changes) you might try to go for linear history. This will only work if nobody else pushed any changes to the main repository while you were doing your changes. Start by creating your private branch:
    … …  
    7474
    7575Again, the push might have failed if somebody else pushed since you created your {{{head_clone}}}. In that case probably the best idea is to try and rebase your merge commit to the new mainline head.
     76
     77== Conclusion ==
     78
     79Unfortunately we have no way of enforcing the right direction of merges. So think twice before you push.