Merging with Bazaar

[Steve Langasek]

On Thu, Nov 05, 2009 at 07:34:49PM +0000, James Westby wrote:

> Thanks to a whole bunch of work from quite a few people coming together
> now is a great time to do merging in bzr. In particular as MoM is down,
> this will allow you to merge without lots of faff. Unfortunately not
> every package is imported yet, but with >14,000 imported there should
> be plenty to work on.

> You can read documentation on how to do it at

>   https://wiki.ubuntu.com/DistributedDevelopment/Documentation

> specifically at

>   https://wiki.ubuntu.com/DistributedDevelopment/Documentation/Merging

> but the short of it is: get

>   lp:ubuntu/<package>

> and run

>   bzr merge-package lp:debian/<series>/<package>

> where <series> could be lenny, squeeze, sid, experimental as appropriate.

Doesn't seem to work for native packages?

$ bzr merge-package lp:debian/squeeze/ucf
bzr: ERROR: No such tag: upstream-3.0021
$

Am I doing something wrong, or should I fall back to a MoM merge for now?

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/ubuntu-devel/attachments/20091105/ff11628e/attachment.pgp