Ok if we are talking about app versioning, I do : # ----------------------------------------------------------------------------- # Documentation Mercurial # -----------------------------------------------------------------------------
# ----------------------------------------------------------------------------- # Initialisation d'un projet : Application Web2py # ----------------------------------------------------------------------------- cd /web2py/applications/APP hg init # crée .hg/ à l'intérieur du répertoire de l'application hg add # Ajoute l'ensemble des fichiers et sous-dossier et leur fichiers et # sous-dossier au gestionnaire de version hg forget cache databases errors sessions # Enlever les sous-dossier à ne pas gérer avec le gestionnaire de version hg commit -m 'commit initial' THEN hg clone to make branch hack hg commit -m 'change message' IN YOUR trunk the initialized app hg pull hg merge Here I let you search for the proper command... I think you can use also the web2py interface for commiting but you will not be able to merge from a app clone to a other... I do everything by hand in terminal to understand what I am doing before use any interface like TortoiseHG... Richard On Thu, Feb 24, 2011 at 2:18 PM, Ross Peoples <[email protected]>wrote: > 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? >
