Code review comment for lp:~rom1-chal/bzr-builder/reporting_conflict_from_merge

Revision history for this message
James Westby (james-w) wrote :

On Mon, 19 Jul 2010 08:03:58 -0000, Romain Chalumeau <email address hidden> wrote:
> I agree. So far, it is a helper for my integration team.
> To explain the context, the development teams wants to go towards
> continuous integration (of course in a single branch).
> As a release manager, i want feature branches.
>
> The bzr-builder helped making coexist the two methods.
> I use daily crons based on recipes to build the integration or release
> branch and send it to hudson.
> With conflicts, I catch the merge exceptions and put the related msgs in
> emails sent only to the targetted developers. It helps me avoiding to
> spam a mailing where the emails are not read anymore. That's the reason
> why i need the developers concerned by a conflict.

Interesting approach.

> I agree that returning the conflicted revisions objects would be more
> flexible to generate custom msg or filter the information.
>
> Yet, the other piece of information i need to communicate is the
> branches that are concerned by the conflict so that the developers can
> easily reproduce the conflict locally. I did not find a "sexy" way of
> listing the branches from a shared repository that contain such or such
> revision. As the recipe contains the urls, i add it to the exception
> msg.

I'm perfectly happy to have the urls in there, it's just including the
list of developers that I find a little specific.

Thanks,

James

« Back to merge proposal