Re: Switching to bzr: what Emacs developers should know?

[Bastien <bastienguerry@googlemail.com>]

B Smith-Mannschott <bsmith.occs@gmail.com> writes:

> Presumably, you've seen this, yes?:
> http://www.emacswiki.org/emacs/BzrForEmacsDevs

> First, initialize a repository in which to store all your branches:
> 
>       bzr init-repo --2a emacs/

(I hope we won't need this "--2a" option anytime soon.)

> Create a branch that will just be a mirror of the mainline. You’ll
> never make any changes to this branch; its job is just to reflect the
> upstream master:
> 
>       cd emacs/
>       bzr branch http://bzr.savannah.gnu.org/sources/emacs/trunk/ trunk/

Is this "trunk" branch necessary, or just a convenience?  

Why isn't the default branch enough for the trunk-tasks described 
in this page?

> And after refreshing the mirror, you’ll want to get those changes into
> your task branch, by merging them:
> 
>       cd SOME-TASKNAME/
>       bzr merge
>       bzr commit -m "Merge from mainline."

Is this merge happening between the local branch and the trunk or the
local branch and the default branch?  

> If you’re one of the Emacs maintainers, then you can just push it directly to the upstream master:
> 
>       bzr push %%bzr+ssh://bzr.savannah.gnu.org/sources/emacs/trunk/%%

Any chance to reduce this to "bzr push"?  

IIUC this sequence will do:

,----
| cd SOME-TASK/
| echo "public_branch = http://bzr.savannah.gnu.org/sources/emacs/trunk" >> .bzr/branch/config
| bzr bind http://bzr.savannah.gnu.org/sources/emacs/trunk/
| cd ..
`----

Then "bzr push" will push to the public_branch location.  Am I right?

-- 
 Bastien