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

Le vendredi 16 juillet 2010 à 20:10 +0000, James Westby a écrit :
> Hi,
>
Hi James

> Thanks for this, it looks great.

Thx
>
> I have a few formatting things that I would like to clean up when I merge,
> but they are minor.
>
> The thing that is stopping me doing it right now is that I'm not sure how
> generally applicable the output is. I'm trying to think of things that would
> both be widely useful, and still give you the information that you need.
>
> Perhaps not showing the developers, but the revisions (like you would get from
> bzr log) for each revision involved in the conflict would work?
>

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.

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 going to ponder this over the weekend, and we can get it landed next week.
>
> Thanks,

Thx to you
Romain
>
> James
>
>
>

--