Merging with Bazaar

[Martin Pitt]

Hello all,

James Westby [2009-11-05 19:34 +0000]:
>   https://wiki.ubuntu.com/DistributedDevelopment/Documentation/Merging

\o/ Thanks for making that so easy!

> but the short of it is: get
> 
>   lp:ubuntu/<package>

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).

Thanks for considering, and have fun merging!

Martin
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/ubuntu-devel/attachments/20091105/4c23b528/attachment.pgp