mvhub-dev team mailing list archive

[Dan MacNeil <dan@xxxxxxxxxx>]

Dan MacNeil has proposed merging lp:~omacneil/mvhub/update_workflow_cheatsheet into lp:mvhub.

Requested reviews:
  MVHub devs with commit rights (mvhub-commit)


see commit msg
-- 
https://code.launchpad.net/~omacneil/mvhub/update_workflow_cheatsheet/+merge/26362
Your team MVHub Developers is subscribed to branch lp:mvhub.

=== modified file 'app-mvhub/doc/cheat_sheets/bzr_workflow.txt'
--- app-mvhub/doc/cheat_sheets/bzr_workflow.txt	2009-12-23 19:16:27 +0000
+++ app-mvhub/doc/cheat_sheets/bzr_workflow.txt	2010-05-29 03:26:24 +0000
@@ -1,33 +1,31 @@
-
-
-# INDIVIDUAL WORKFLOW
+# Purpose: quick overview of bzr commands needed to do MVHub development
+
 
 # getting help
 
 	bzr help [command]
 	# user manauls
-
-# http://bazaar-vcs.org/Documentation
-
-
-#	pull trunk 
-		cdws
-		cd trunk
-		bzr pull
-
-#	make a feature/bug branch
-		cdws 
-		
+ 	http://bazaar-vcs.org/Documentation
+
+# understanding status msgs
+	http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html#status-flags
+
+
+
+# PROCEDURE Make A Feature / Bug Branch
+
+		cdws 		
 		# good branch names include bug numbers 
 		# or clear description of bug/feature
 		
-		bzr branch trunk $YOUR_NEW_BRANCH_NAME
+		bzr branch lp:mvhub/trunk $YOUR_NEW_BRANCH_NAME
 
 #	push your branch to launchpad
 		cdw 
 		bzr push
 		
-#	make your http://mvh.$USER.testing123.net active
+#	make branch show up in your testing site
+# 		http://mvh.<your username>.testing123.net active
 
 		# pick your branch
 		mv_set_active
@@ -46,6 +44,7 @@
 		# find out what has changed
 		bzr status 	
 
+		# look at the diff
 		# in different window
 		# so you can recall 
 		# what you changed
@@ -58,7 +57,7 @@
 		bzr merge ../trunk
 		bzr commit -m "merged trunk"
 				
-#	make a merge request to trunk by email
+# PROCEDURE	Make A Merge Request
 
 		# be sure your branch has latest
 		# changes from trunk 
@@ -77,13 +76,6 @@
 		# / pushed branch first
 		bzr commit
 		bzr push
-		
-		# make the merge request
-		bzr send
-		# follow bouncing prompts, 
-		# TIP: send is 'y' key
-					
-#	make a merge request by web
 
 		# be sure you have tested/ commited / pushed branch 
 		
@@ -116,45 +108,14 @@
 		mv_prove -r app-mvhub/t
 		mv_prove -r lib-mvhub/t
 		
-		#Assuming no conflicts,test failures or other problems
+		# Assuming no conflicts,test failures or other problems
 		bzr commit -m "merged trunk"
                 bzr push
 		
-		
-#	merge from your branch to trunk 	
-		cdws
-		cd trunk
-		bzr pull
-		bzr merge ../$YOUR_BRANCH
-		
-		# set active branch to trunk to run the tests
-		
-		mv_set_active
-		cdw
-		
-		# run tests 
-		mv_prove -r app-mvhub/t
-		mv_prove -r lib-mvhub/t
-		
- 		#Assuming no conflicts,test failures or other problems
-		bzr commit 
-		bzr push
-		
-		# set active branch to something OTHER than trunk 
-		# to avoid future ACCIDENTS
-		mv_set_active
-		
-		# OPTIONAL: remove branch from your local workspace
-		cdws
-		rm -rf $YOUR_BRANCH
-		# OPTIONAL: remove branch from launchpad web page
-#		1. firefox code.launchpad.net/mvhub/
-#		2. click on your branch
-#		3. click trashcan (next to title of 
-#		   branch at top of page)
-#		4. click confirm
+		# ask somebody to review your branch
+		# Look
 
-# 	revert to previously committed / throw away changes
+# PROCEDURE 	Revert to Previously Committed Version / Throw Away Changes
 
 	# remove all changes since last commit 
 	# in this dir and all sub dirs
@@ -176,34 +137,52 @@
 		# choose branch URL from above
 		bzr branch $BRANCH_URL
 
-#	reviewing somebody else's branch by email
-
-	# reply to email w/ comments and (1) or more commands below
-	# command must have leading white space
-	review approve 
-	review disapprove 
-
-	review abstain 
-	review resubmit 
-	review needs-fixing
-
-	reviewer <name> 	# ask somebody else to review it
-
-#	merging somebody else's branch to yours
+
+# PROCEDURE:	Merging Somebody Else's Branch to Yours
 
 	bzr merge <branch url>
 	# examples:
 		bzr merge lp:~omacneil/mvhub/doc_add_bzr_cheatsheet
 		bzr merge ../../mansi/source-code/+junk
 
-# resolving conflicts
+# PROCEDURE Resolving Conflicts
+
 	$EDITOR <files>  # remove <<<< and >>> conflict markers
 			# and duplicate code
 	bzr resolve
 	# see also:
- # http://doc.bazaar-vcs.org/bzr.0.92/en/user-guide/conflicts.html
+ 	# 	http://doc.bazaar-vcs.org/bzr.0.92/en/user-guide/conflicts.html
  
-# understanding status msgs
-	# see
-# http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html#status-flags
+
+# PRODEDURE:	Merge From Your Branch To Trunk 	
+		
+#	You'll need to be in the mvhub-commit group
+# 	to be able to do this		
+
+		cdws
+		cd trunk
+		bzr pull
+		bzr merge ../$YOUR_BRANCH
+		
+		# set active branch to trunk to run the tests
+		
+		mv_set_active
+		cdw
+		
+		# run tests 
+		mv_prove -r app-mvhub/t
+		mv_prove -r lib-mvhub/t
+		
+ 		#Assuming no conflicts,test failures or other problems
+		bzr commit 
+		bzr push
+		
+		# set active branch to something OTHER than trunk 
+		# to avoid future ACCIDENTS
+		mv_set_active
+		
+		# OPTIONAL: remove branch from your local workspace
+		cdws
+		rm -rf $YOUR_BRANCH
+