Richard, So, according to your first link, I should hit the Clone button to download the web2py trunk to a folder on my machine, then copy my application's files to the new directory. Then delete the old folder and rename the new one to the name of the old one. Then do a commit.
Does that sound right? And in the future, how would I do another merge of the trunk with the version I have on my machine?
