Re: Bazaar workflow for GRUB

[Michal Suchanek]

2010/1/19 Colin D Bennett <address@hidden>:
> On Tue, 19 Jan 2010 11:52:27 +0100
> Michal Suchanek <address@hidden> wrote:
>
>> 2010/1/19 BVK Chaitanya <address@hidden>:
>> > On Mon, Jan 18, 2010 at 11:19 PM, Colin D Bennett
>> > <address@hidden> wrote:
>>
>> >>>
>> >>> # create a patch and send to mailing list
>> >>> grub$ bzr diff -r submit: > ~/my-issue-fix.diff
>> >>
>> >> Why not use “bzr send -o ~/my-issue-fix.patch” to create a merge
>> >> directive+patch+revision bundle?  The benefit of bzr send over
>> >> plain bzr diff is that individual revisions within the change are
>> >> preserved, which can provide richer history.  Merge directives can
>> >> simply be applied with “bzr merge my-issue-fix.patch”.
>> >>
>> >
>> > I haven't seen anybody sending "bzr send" patches in the ML, so I
>>
>> Perhaps they did not know or did not need to. AFAICT there isn't any
>> rebase feature in bzr so sending these is the only option for longer
>> lasting local branches.
>
> There is actually a ‘rebase’ plugin for bzr (“bzr branch lp:bzr-rebase
> $HOME/.bazaar/plugins/rebase” to install for a user).  I'm not sure how
> ‘bzr send’ is in some way more useful if a rebase operation was not
> available, however.

It contains the revision bundle.

With rebase you can send a series of patches which apply on the latest
trunk and each have their own description.

Failing to rebase you get only one huge merged patch and have to rely
on the revision bundle to provide the description and separation of
the changesets.

Thanks

Michal