Hi Tim - The process you describe for contributing either risks overwriting web2py-sphinx changes, or assumes that both devel and web2py-sphinx branches are already in sync;
After you once have a branch of web2py-sphinx, and a pull of devel, I think you will need to merge web2py-sphinx with devel before beginning to make changes destined for web2py-devel. That is, from your local web2py-sphinx, something like this: $ bzr merge #from saved lp: .... web2py-sphinx $ bzr merge devel #from local devel $ # resolve any conflicts! $ # make docstring changes to web2py-sphinx tree, then ... in case anyone else has made changes since: $ bzr merge $ bzr push Something like that, don't you think? - Yarko On Wed, May 6, 2009 at 1:48 AM, Tim Michelsen <timmichel...@gmx-topmail.de>wrote: > > Hi! > > > Note: The build setup may curretly not work correctly due to outstanding > > configuration isuues. > All config issues have been removed. > > > This will be adjusted during the course of the week. > I just pushed the latest changes to the repository: > https://code.launchpad.net/~web2py/web2py/web2py-sphinx<https://code.launchpad.net/%7Eweb2py/web2py/web2py-sphinx> > > You can see the problems we are still having at: > > http://bazaar.launchpad.net/%7Eweb2py/web2py/web2py-sphinx/annotate/head%3A/doc/sphinx-build.log > > > In future versions, we need to update the > web2py .bzrignore to exclude the logs. > > Just branch the files and follow instructions in the help file: > > http://bazaar.launchpad.net/%7Eweb2py/web2py/web2py-sphinx/annotate/head%3A/doc/source/docs_contrib.rst > > I hope that you are all able to built the docs! This come already very > close to a 1-stop-doc-shop. > > I will not do major chnages during the netx days. But I will be reading > list mails and respond of problems occur. > > Happy documenting, > Timmie > > > > > --~--~---------~--~----~------------~-------~--~----~ 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 web2py+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/web2py?hl=en -~----------~----~----~----~------~----~------~--~---
