Help with gatekeeper workflow.

[Eric Berry]

Hi Marius,

On Tue, Mar 3, 2009 at 11:23 PM, Marius Kruger <amanic at gmail.com> wrote:

> 2009/3/4 Eric Berry <elberry at gmail.com>
>
>> The problem with this approach is that we get the merges from trunk as
>> part of Joe's history - which isn't bad, but can distract Bob from Joe's
>> real changes.
>
>
> I don't think its that bad or that it is really avoidable other than using
> `bzr replay` from the rebase plugin.
> I think if you standardize the merge commit message eg. "merge main",
> you should be able to ignore them easily enough.
>

Yeah definitely. :) I didn't think it was that bad either, just wanted to
see if there was any way to avoid it. It sounds like there isn't and it's
acceptable. :)


>
> After you merge his changes into main,
> `bzr diff` would in any case show you all the real changes he made.
>

Good point, I didn't think of that.


>
> this is bad, don't even consider it IMHO
>
>

Yeah, I wanted to avoid this one all together, but it did seem like another
viable approach.

So it seems like option 1 is the best solution for the situation?

Thanks so much for all the help!
Eric

-- 
Learn from the past. Live in the present. Plan for the future.
11101000
http://www.townsfolkdesigns.com/blogs/elberry
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090303/cfe073b5/attachment.htm