Merging before sending a patch ?

[Xavier Maillard]

Hi,

Say I have created a branch foo.dev from foo.

I am hacking on foo.dev and in parallel, food is updated.

At some point I feel ready to submit my changes as a patch to the
team.

I do bzr send -o (for example) but it will only take new
revisions to put them into my output.patch. How do I "rebase" my
work on top of the updated food ? Do I need to bzr pull into foo
and then bzr send or is there another and simpler way ?

Regards

	Xavier
-- 
http://www.gnu.org
http://www.april.org
http://www.lolica.org