We had some trouble this morning that points out the need for some basic rules when working on branches. A have written up at dhis2.org which is copied in below. Please read carefully.
A few rules apply when working with the source code branches:
Never use bzr push! Pushing will replace the content in trunk which means that the revision history will be lost. It is also prone to merging mistakes like overwriting other work in trunk.
Never use bzr uncommit! If you have made a mistake and want to fix it, then do bzr merge -r 100…90 (replace 100 and 90 with the revisions you want to remove) and commit as usual. Un-comitting will lead to problems as the lastest changes will be undone for all working copies when updated.
When its time to merge your branch with trunk, given that you have the required authority, please follow these steps:
Make sure you don’t have un-comitted changes in your branch.
Navigate to a checkout of trunk and make sure there are no un-comitted changes there.
Merge with bzr merge lp:~dhis2-devs-core/dhis2/branch-name (replace branch-name with the name of your branch).
Go through the changes with bzr status and bzr diff.
We had some trouble this morning that points out the need for some basic rules when working on branches. A have written up at dhis2.org which is copied in below. Please read carefully.
A few rules apply when working with the source code branches:
Never use bzr push! Pushing will replace the content in trunk which means that the revision history will be lost. It is also prone to merging mistakes like overwriting other work in trunk.
Never use bzr uncommit! If you have made a mistake and want to fix it, then do bzr merge -r 100…90 (replace 100 and 90 with the revisions you want to remove) and commit as usual. Un-comitting will lead to problems as the lastest changes will be undone for all working copies when updated.
When its time to merge your branch with trunk, given that you have the required authority, please follow these steps:
Make sure you don’t have un-comitted changes in your branch.
Navigate to a checkout of trunk and make sure there are no un-comitted changes there.
Merge with bzr merge lp:~dhis2-devs-core/dhis2/branch-name (replace branch-name with the name of your branch).
Go through the changes with bzr status and bzr diff.
Commit your changes.
Don’t forget to merge trunk into your branch before merging your branch into trunk:
your_branch>$ bzr merge lp:dhis2
then
trunk>$ bzr merge lp:~dhis2-devs-core/dhis2/your_branch
If there are any uncommited changes in your working copy you are not even allowed to merge.