Yarko I haven't tried it yet but many thanks for a great write-up. One for AlterEgo?
On Nov 5, 7:54 am, "Yarko T" <[EMAIL PROTECTED]> wrote: > I posted this earlier, and Tim pointed out trouble with PC bazaar.... I've > revised my guide (and worked out PC end of things): This assumes informally > you have created a local branch on your private machine where you do work, > and keep it merged with the trunk (currently, there is only Massimo's > development branches; we will create a trunk to hold released merges - > including Massimo's work). > That is, you've done: > > - bzr branch lp:~mdipierro/web2py/devel > - bzr commit -m 'initial checkout from Massimo' > - (hack, hack, hack....) > - bzr merge # pull new updates from Massimo > - bzr commit -m 'checkin after merge...' > - ... and so on... > > When you have a new function idea, or think you've found a bug, ask Massimo > on the group. > > - If you have a new feature, register a blueprint on Launchpad and > describe what you're going to do. > - If you have found a bug, make a bug report on Launchpad (later assign > it to yourself, and link your branch to it); > - If you want to work on a project, look for an unassigned bug and try to > work it out - then proceed as below... > > When you are ready to share your work have others review, register a branch > > NOTE: once you create a branch, there is no easy way to remove it. > NOTE: You can re-use one branch for multiple bug fixes; > > 1. sign up for an account on launchpad.net, > 2. go to the project and select "register branch" ( > https://code.launchpad.net/web2py/+addbranchor > https://code.launchpad.net/t2/+addbranch). Suggest you create a hosted > branch, you can work locally, and pull / push as you make progress (see > http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#organizing-... > ) > 3. Once you have registered your branch launchpad will provide you with > instructions on how to pull and push to your personal development copy. > 4. Link your bug report or blueprint to your branch. > 5. merge from your "parent" (trunk, massimo's main branch, or others you > are working with) as needed. > 6. Push your working copy to launchpad as your work is ready for others > to review, test (see following reply for guidelines on pushing if using a > PC) > 7. Once you are done making your changes, have completed testing, and are > ready for the project team to inspect & test, please select "propose for > merging" > 8. Somebody on the core team will make a test merge (it may include > merging with other patches). Once tests pass, and your branch is accepted, > it will be merged into the trunk. > > Once merged, you may repeat the process - make another branch and :-). --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "web2py Web Framework" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/web2py?hl=en -~----------~----~----~----~------~----~------~--~---
