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

Changes between Version 17 and Version 18 of BazaarWorkflow


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

Reogranize sentence to make it more readable.

Legend:

Unmodified
Added
Removed
Modified
  • BazaarWorkflow

    v17 v18  
    112112== How do I know it is safe to push to the main repository? ==
    113113
    114 In case you are wondering, there is one foolproof way to check that you can push from a repository ''A'' to the mainline. (It could be even automated on the client side.) First look at the log of the main repository and find the last changeset (the mainline head, ''H''). Now look at the log of repository ''A'' from which you would like to push. If it contains the mainline head ''H'' (use {{{bzr log --show-ids}}} and compare {{{revision-id}}}) (usually as the second changeset from the top), it is safe to push. If you do not see the mainline head, stop!
     114In case you are wondering, there is one foolproof way to check that you can push from a repository ''A'' to the mainline. (It could be even automated on the client side.) First look at the log of the main repository and find the last changeset (the mainline head, ''H''). Now look at the log of repository ''A'' from which you would like to push. If it contains the mainline head ''H'' at some point, it is safe to push. Use {{{bzr log --show-ids}}} and compare {{{revision-id}}}. Usually, the first changeset at the top should be a merge changeset, and the second one should be the mainline head ''H''. If you do not see the mainline head, stop!
    115115
    116116Normally you will know what repositories are safe to push because they are not diverged (the clone of the main repository) and which are not (your feature branches).