if you use bzr, then "bzr merge" will do this for you; in svn, I think "svn merge" does the same.
On Wed, Sep 30, 2009 at 12:15 PM, AndrewLoot <[email protected]>wrote: > > but how do you keep the web2py code base up to date, o don't want ot > manually copy files over... what if the code-base losses some old > files then i have them laying around. Im thinking of another approach > but a build process that combines separate projects of web2py and my > code for web2py seems to be the best way. I guess i could use svn > externals on my app folder inside the applications folder, but what if > i want changes in the app.yaml or have mods to the web2py code- > base.... I firmly believe in source control and a build process it > feels like horse and buggy days trying to dev on an active project by > manually copying files. > > On Sep 30, 11:59 am, "mr.freeze" <[email protected]> wrote: > > I run Eclipse/PyDev with the svn trunk with no problems. Perhaps your > > build process is breaking it somehow? > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "web2py-users" 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 -~----------~----~----~----~------~----~------~--~---
