So hopefully I will have access to trunk in a couple of days and before committing directly to trunk I want to confirm that I've understood the workflow with bazaar correctly so I don't mess anything up and make it as easy as possible for me to develop. I use Ubuntu and work from the terminal.

I've read the http://wiki.inkscape.org/wiki/index.php/Working_with_Bazaar page a couple of times trying to figure out exactly what workflow would suit me. The SVN style goes away directly (I want to do everything locally first and push only when I say so). The git-style branches with bazaar seems somehow forced into bazaar and not very appealing to me.

I'm left with the branching and pushing...and I can live with the little longer time it takes to branch the big codebase.

My questions:

1) The big "gotcha" is that I shouldn't merge trunk into my feature branch and then push back to trunk, is this correct?

2) If I develop a new feature in a separate branch is the following workflow a correct way to get it into trunk?

cd trunk

bzr pull (get the most reason trunk first)

bzr merge ../myproject

bzr commit -m "Added myproject"

bzr push