[Pkg-samba-maint] Workflow new upstream merge in our bzr repo

[Steve Langasek]

On Tue, Mar 15, 2011 at 07:56:45PM +0100, Luk Claes wrote:
> What are the steps I should take to merge a new upstream in our bzr
> repository? I see that there are upstream refs, though how do they get
> there as upstream is still git?

A write-up of the workflow is here:

  http://web.dodds.net/~vorlon/wiki/blog/bzr-git_case_study.html

In particular, the last two paragraphs apply to merges of new upstream
versions.

-- 
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: 828 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20110315/e430013d/attachment.pgp>