On Feb 3, 2010, at 9:09 AM, Thadeus Burgess wrote: > if you already have a clone, make your changes, then commit them to > your local copy. > > When you want updates do > > hg pull web2py && hg merge > > It should update and leave your changes, unless there is a conflict > which you will need a program such as "MELD" to solve.
It'd be nice to have a slice or wiki page or something on hg+web2py. Commands, workflow, hints--since most of us are relatively new to hg. Ideally, not just the commands, but some explanation of what's going on. > > -Thadeus > > > > > > On Wed, Feb 3, 2010 at 11:02 AM, Wes James <compte...@gmail.com> wrote: >> Say I do: >> >> hg clone web2py >> >> I make changes to the code, then later another update comes out for >> web2py and I want my changes added to the update. Can someone help me >> with this process? >> >> thx, >> >> -wes -- You received this message because you are subscribed to the Google Groups "web2py-users" group. To post to this group, send email to web...@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.
