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

[Luk Claes]

On 03/15/2011 10:13 PM, Steve Langasek wrote:
> 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.

Thanks, I'll have a look.

Cheers

Luk