Changes between Version 61 and Version 62 of InstallationGuidelines/VirtualMachine

Timestamp:

09/18/13 11:54:21 (11 years ago)

Author:

Pat Tressel

Comment:

--

InstallationGuidelines/VirtualMachine

@@ -82 +82 @@
 (git requires a name for a branch if you want to preserve commits.)
 ==== Update web2py ====
-On occasion, the latest revision of Web2py is not stable. Check the topic in the #sahana-eden IRC channel on freenode for the latest known-safe revision.
 To update Web2py to the latest revision:
 {{{
 cd /home/web2py
-git pull
+git pull origin master
 }}}
-To update to a specific revision, do the following with nnnn replaced by the revision you want.
+On occasion, the latest revision of Web2py is not stable, or is incompatible with the current version of Eden.
+Check the topic in the #sahana-eden IRC channel on freenode for the latest known-safe revision.
+The following shows checking out a specific revision as the master branch, by first renaming master,
+then checking out the desired revision as master, then getting rid of the former master branch.
 {{{
 cd /home/web2py
-git checkout <VERSION>
+git branch -m master latest_master
+git checkout -b <recommended_revision> master
+git branch -D latest_master
 }}}