On Feb 24, 2011, at 10:43 AM, Ross Peoples 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. >
You're probably better off starting with a clone of the web2py trunk, and making your edits to that. In your specific example, though, I believe that you can't merge until you commit revision 2. I wouldn't bother, though, because the web2py trunk will give you a good starting point for .hgignore. FWIW, my hg repositories for my web2py apps don't include web2py--just the app itself.
