This is my basic workflow (except for 6), copied from chaley, and I've also copied his description of his workflow from my notes:
Quote:
I keep 2 sources locally. One is a copy of trunk called 'base', obtained with bzr pull. The other is my development branch.
All my branches use a shared repository. This makes pulls, pushes, and merging much faster.
Workflow:
1. pull changes from launchpad to 'base'
2. merge base into 'dev'
3. make changes, do work, etc
4. commit changes in dev. Often more than one commit.
5. check if new changes are in base. If so, repeat steps 1 and 2 to ensure that there are no change conflicts.
6. push changes from dev to my repository on launchpad. Kovid reviews and merges from there.
I have both base and dev so I can run from either to help debug, have rapid access to the change logs and diffs, and rarely to add print statements in the trunk code to help see what is going on. In the latter case, I revert the branch before pulling from launchpad.
|
In step 6. I haven't bothered to set up a launchpad repository, since I don't have time to do much extensive work. I've just created a diff file with:
bzr send -o "Automerge_Updates.txt"
and posted them to the buglist with a request to have them merged in.