Just to know would contribute to web2py developement?

If not, you only need to track your app and it should be much more easy to
setup there is this blog that help :
http://pierreth.blogspot.com/2010/10/web2py-eclipse-pydev-recipe.html

There is also those ressources for mercurial in general :
http://hgtip.com/
http://hginit.com/
http://hgbook.red-bean.com/


Richard

On Thu, Feb 24, 2011 at 1:43 PM, Ross Peoples <[email protected]>wrote:

> After reading Jonathan's posts about Mercurial, I have decided to start
> using it during my development. My only problem is I can't seem to figure
> out how to set this up properly. I am using MacHG and have only made a
> couple of test commits. Then, I wanted to download the web2py trunk and
> merge it with my web2py folder by using pull. I ended up with all of the
> commits for the entire web2py trunk. At first I thought this was cool, but
> then when I went to try and merge my last commit to the latest web2py
> revision, and I got an error about outstanding uncommited changes. I tried
> using update, but that gave me a different error.
>
> So my question is, how do I set up version control with web2py's trunk and
> my code so that I can merge my code with the latest web2py commits when I'm
> ready to update from the web2py trunk? In other words, I have no idea what
> I'm doing. I included a screen shot of MacHG to help explain things a bit
> better. Thanks.
>
>
> <https://lh3.googleusercontent.com/_we-JWtgkmps/TWamj4KhrsI/AAAAAAAAAA4/UyTyIsLirfQ/Screen%20shot%202011-02-24%20at%201.41.13%20PM.png>
>
>

Reply via email to