Work flow for checking out, branching from bugzilla trunk ...

[Kleindenst, Fred]

Hello Devs,

I'm looking for some sage advice on the best workflow for using source code control on several bugzilla bugs.

Background
-------------
I'm used to working with git.  I have in dir a clone of the repo; and we are using a branch called "production" to be our HEAD.  When I start work on a new bug, I make a new branch based on "production":
  Git checkout -b NewBranch
This gives me (effectively) a fresh copy of "production" in a new workspace. I do some work, maybe a couple of commits, tests, etc.  When I'm happy with everything, I switch back to "production":
  Git checkout production
(make sure production is up to date) And then bring in my changes:
  Git merge "NewBranch"
I can then push as needed to get things upstream to the live server.


I'd like to do roughly the same with bzr and bugzilla.
------------------
I've gotten a copy to start with:
  Bzr checkout http://bzr.mozilla.org/bugzilla/trunk/  trunk
    
Then made a copy work in
  Bzr branch trunk myNewBranch

And got a diff out
  Bzr diff > myNewBranch.diff


What would I do to "pull" other changes from Mozilla into trunk, then into myNewBranch?


Any other tips for a good work flow?


Fred Kleindenst
EMC² | Isilon Storage Division
Senior Tools Developer
Office: 206.777.7887
Email: fred.kleindenst at isilon.com