Merging with Bazaar

[James Westby]

On Thu Nov 05 23:55:19 +0000 2009 James Westby wrote:
> On Thu Nov 05 22:42:56 +0000 2009 Martin Pitt wrote:
> > There's one thing to watch here: We already have had lots of
> > packages in "real" bzr branches (not the per-upload granularity
> > auto-imports). So before you merge a package, please check if it has a
> > Vcs-Bzr: header. If so, please use that, not the auto-imported branch.
> > 
> > Nowadays I keep getting a lot of merge requests which were done
> > against the auto-import; these are not mergeable at all, since they
> > have zero common history).
> 
> Ah yes, thanks for bringing this up Martin, I forgot that there was
> another point I wanted to make.
> 
> We are now finally in a position to make this problem go away. Therefore
> I need to know candidate packages that this should be done for. The
> following criteria must be met:
> 
>    * You are happy to have a bot commit to the branch if someone else
>      uploads without pushing.
> 
>    * The branch contains the full source of the package, not just
>      ./debian/, and you are willing to embrace the proposed way of
>      structuring the package. I know some people are attached to their
>      ./debian/ only branches, but that way is an evolutionary dead-end,
>      so I am unwilling to make it part of this effort.
> 
>    * The branch is up to date with what is in the archive.

Oh, and all the branches for Debian/Ubuntu that you want to have this
happen to must be hosted on Launchpad. Unfortunately I haven't yet backdoored
bzr to allow me write access to any branch I choose, we need LP magic to
do this.

[ For those interested, LP currently allows a very restricted set of people
  to set the links that make this work, so it's not a button that just anyone
  can press to gain write access to your branch. However, it's not good even
  allowing me to do that, so they wish to implement a handshake, or only
  allow those in the intersection of uploaders and branch owners to set the
  link, so that it's not vulnerable to attack. ]

Thanks,

James