Re: [web2py] making changes in web2py
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. -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. -- 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.
Re: [web2py] making changes in web2py
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.
Re: [web2py] making changes in web2py
What is wrong with http://mercurial.selenic.com/guide/ There is nothing special about hg+web2py together. -Thadeus On Wed, Feb 3, 2010 at 11:13 AM, Jonathan Lundell jlund...@pobox.com wrote: 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. -- 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.
Re: [web2py] making changes in web2py
On Feb 3, 2010, at 9:19 AM, Thadeus Burgess wrote: What is wrong with http://mercurial.selenic.com/guide/ There is nothing special about hg+web2py together. I was hoping for something a little more concise, and also some guidance for how to use my own clones (or whatever) on Google Code. We've talked a little about code review, and it seems to me that making use of personal repositories on GCode would facilitate that. But when I tried to do it a few weeks ago, I got confused and messed it up. The use cases I'm thinking of: * a developer (you, me, whoever) pushes a proposed change to their public repository and posts a link (whatever) here for review * Massimo pulls the change from that repository, rather than our having to try to pass around patches by email. -- 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.
Re: [web2py] making changes in web2py
Massimo seems to prefer emailing patches rather than pulling from our cloned repositories. Since he wants exact specific control over what gets pulled in. Kind of like quality control until he trusts the developer I suppose :) Linus Torvalds also prefers this approach of diffs instead of clones for these very same reasons, so its understandable. Web2py is his baby and nothing should come to harm it :) -Thadeus On Wed, Feb 3, 2010 at 11:29 AM, Jonathan Lundell jlund...@pobox.com wrote: ssimo pulls the change from that repository, rather than our having to try to pass around patches by em -- 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.
Re: [web2py] making changes in web2py
On Feb 3, 2010, at 9:38 AM, Thadeus Burgess wrote: Massimo seems to prefer emailing patches rather than pulling from our cloned repositories. Since he wants exact specific control over what gets pulled in. Kind of like quality control until he trusts the developer I suppose :) Linus Torvalds also prefers this approach of diffs instead of clones for these very same reasons, so its understandable. Web2py is his baby and nothing should come to harm it :) Aren't diffs available as well, under that scenario? (Actually, Linus does take pulls, but he doesn't integrate them blindly.) -Thadeus On Wed, Feb 3, 2010 at 11:29 AM, Jonathan Lundell jlund...@pobox.com wrote: ssimo pulls the change from that repository, rather than our having to try to pass around patches by em -- 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. -- 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.
