mvhub-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Sri Redy <reddy22222@xxxxxxxxxx>
Related merge proposals:
  https://code.launchpad.net/~reddy22222/mvhub/fix_cheatsheet/+merge/26735
  proposed by: Srihari Reddy (reddy22222)
  review: Approve - Dan MacNeil (omacneil)
------------------------------------------------------------
revno: 399 [merge]
committer: Dan MacNeil <dan@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-06-08 11:33:01 -0400
message:
  merged Sris doc fix to bzr_workflow.txt
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-01 20:56:27 +0000
+++ app-mvhub/doc/cheat_sheets/bzr_workflow.txt	2010-06-03 18:47:16 +0000
@@ -54,7 +54,7 @@
 
 		# merge trunk ---> your branch
 		cdw
-		bzr merge ../trunk
+		bzr merge lp:mvhub/trunk
 		bzr commit -m "merged trunk"
 				
 # PROCEDURE	Make A Merge Request