Merging with Bazaar

[James Westby]

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.

I will review and change the links when I get some time, this will mean
the outlined procedure will work for your branches without other developers
having to notice that the package is special. I am generating a list based
on Vcs-Bzr, but I haven't finished the scripts to do these checks for me
yet, and there are too many to review completely by hand.

Thanks,

James