[rfc] merging release branches back into bzr.dev

[Martin Pool]

Hi,

Our current instructions for making releases say that after doing the
release, the rm should make an untracked merge back into trunk.

I can see two main reasons for this: one is that it prevents people
accidentally pulling trunk into a branch that's based on the release;
the other is that it's arguably incorrect to merge the change that
gave the release it's version number.  

In the particular case of 0.91, I made some changes after declaring the
release, and there are still some patches in bundle buggy that are
merged into 0.91.  It would be simple to do a tracked merge and bb
would then see that they were merged into trunk, and it'd let us see
that everything else has been fully integrated.

-- 
Martin