BTW - I notice that someone named their branch "trunk" - BAD --- by convention, in too many documents, "trunk" is assumed to refer to the "trunk" of the tree ---- put another way, the MAIN BRANCH.... Massimo preferred to name his branch "devel" - so this could definitely cause BAD CONFUSION.
I suggest the following: Massimo - make a "series" and figure out how to call the series "main" or "trunk"; this should probably be your current working branch. See https://code.launchpad.net/python3patterns for example to see how this looks. Robin - Change your "trunk" branch name to something else - "devel" at least. (you do this from the center of that branch's main page - the icon that looks like "!" edits these things - careful! the icon that looks like "-" deletes the branch. Regards, Yarko You should change this ASAP On Sat, Nov 8, 2008 at 11:08 PM, Yarko T <[EMAIL PROTECTED]> wrote: > It's clear you need a practice merge.... > The branches there should be workspaces - sandboxes. > > When someone pushes their local work to their branch, because they think > it's current and easy, then they will notify for merging to another branch. > > It will look like the attached images. You should than make a branch from > IT, and do your merging locally. > > > > On Sat, Nov 8, 2008 at 4:31 PM, mdipierro <[EMAIL PROTECTED]> wrote: > >> >> I notice there are 4 launchpad branches: >> >> Do some of them contain patches that I am supposed to merge? If so let >> me know. >> >> We should make clear which one of the official one. How do we do it? >> >> Massimo >> >> >> >> > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "web2py Web Framework" group. To post to this group, send email to web2py@googlegroups.com 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 -~----------~----~----~----~------~----~------~--~---
