mvhub-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Dan MacNeil (omacneil)
Related merge proposals:
  https://code.launchpad.net/~omacneil/mvhub/csheet_mv_up/+merge/31335
  proposed by: Dan MacNeil (omacneil)
  review: Approve - Dan MacNeil (omacneil)
------------------------------------------------------------
revno: 461 [merge]
committer: Dan MacNeil <dan@xxxxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-07-29 18:23:38 -0400
message:
  merged csheet_mv_up
modified:
  app-mvhub/doc/cheat_sheets/bzr_workflow.txt


--
lp:mvhub
https://code.launchpad.net/~mvhub-commit/mvhub/trunk

Your team MVHub Developers is subscribed to branch lp:mvhub.
To unsubscribe from this branch go to https://code.launchpad.net/~mvhub-commit/mvhub/trunk/+edit-subscription

=== modified file 'app-mvhub/doc/cheat_sheets/bzr_workflow.txt'
--- app-mvhub/doc/cheat_sheets/bzr_workflow.txt	2010-06-28 20:13:48 +0000
+++ app-mvhub/doc/cheat_sheets/bzr_workflow.txt	2010-07-29 21:00:25 +0000
@@ -21,7 +21,7 @@
 		bzr branch lp:mvhub/trunk $YOUR_NEW_BRANCH_NAME
 
 #	associate your branch with a bug report (if applicable)
-	  bzr --unchanged -m 'associate: <bug num>' --fixes lp:<bug num>
+	  bzr commit --unchanged -m 'associate: <bug num>' --fixes lp:<bug num>
 
 #	make branch show up in your testing site
 # 		http://mvh.<your username>.testing123.net active
@@ -33,7 +33,7 @@
 		cdw 
 		bzr push
 		
-#	do your work, but save & integrate often
+#	do your work, but commit & merge trunk into your branch often
 
 		cdw
 
@@ -55,10 +55,13 @@
 
 		bzr commit
 
-		# merge trunk ---> your branch
-		cdw
-		bzr merge lp:mvhub/trunk
-		bzr commit -m "merged trunk"
+                # merge trunk ---> your branch
+                cdw
+                bzr merge lp:mvhub/trunk
+                bzr commit -m "merged trunk"
+                # apply database schema changes
+                mv_update_development			
+                mv_prove -r app-mvhub/t lib-mvhub/t
 				
 # PROCEDURE	Make A Merge Request