As far as contributions go, you will just be sending diff files in. As long as your diff is clean it should not matter what is in your repository. Massimo does not use the hg import/export commands so you don't even need to commit any contributions to your local version anyways.
-- Thadeus On Mon, Aug 9, 2010 at 11:19 AM, Jonathan Lundell <[email protected]> wrote: > On Aug 9, 2010, at 9:06 AM, Michael Wolfe wrote: > >> OK, but that still leaves a link to routes.py in the web2py >> repository. Do you use the Pull --> Update --> Merge --> Commit >> approach then when you update your web2py repository? > > Actually, I misdescribed my configuration slightly. > > I run my app linked to a normally downloaded-and-installed web2py stable, not > the hg pull. I use the hg-pulled copy for working on web2py, and not my > application. > > If I had to keep the two "projects" (web2py and my app) in one tree, I think > I might use .hgignore in the web2py root to exclude routes.py and my app > folder. That's not a complete solution, because .hgignore is itself in > web2py's repository. > >> >> On Mon, Aug 9, 2010 at 11:40 AM, Jonathan Lundell <[email protected]> wrote: >>> On Aug 9, 2010, at 8:20 AM, mwolfe02 wrote: >>> >>>> I'm just looking for a best practice here. I am running web2py using >>>> a clone of the repository https://web2py.googlecode.com/hg/. This has >>>> worked really well for me. However, I just added a routes.py file. >>>> Clearly, I want to version control this file, but that requires >>>> committing the change to my local web2py repository. That's not a >>>> problem, except that every time I update to the latest web2py version >>>> I'll have two heads and have to merge. The merge should always be >>>> done without conflicts, but it would be an extra step I'd have to do >>>> each time. Also, if I wanted to send patches in at some point in the >>>> future, would those extra changesets in my local repository cause >>>> problems? >>> >>> I can describe what I do. It would have to be elaborated a bit to handle >>> multiple applications. >>> >>> I keep a separate repository for my application, with a soft link from >>> applications/ to tie it into web2py. I keep my routes.py in >>> applications/myapp/private/, and move or link it to the web2py root as part >>> of installation. >>> >>> App-specific routes.py will change this a bit, but it won't completely >>> address the issue, since we still need a base routes.py at the web2py root. >>> >>> > > >
