Code review comment for lp:~doxxx/bzr/mergetools-commands

On 2/25/2011 7:35 AM, Vincent Ladeuil wrote:
>>> This seems to depart from the way the conflicts are reported in the other
>> cases for no good reason, can you unify it instead ?
>>
>> It's the same way that the 'auto' action reports it.
>
> Sorry for being imprecise.
>
> 'auto' lists the conflicts resolved, I don't think you do.

I do.

+ ui.ui_factory.show_message('%d conflict(s) resolved.' %
resolved)
+ unresolved = tree.conflicts()
+ if len(unresolved) > 0:
+ ui.ui_factory.show_message('Remaining conflicts:')
+ for conflict in unresolved:
+ ui.ui_factory.show_message(str(conflict))

> The other cases mentions the number of remaining conflicts, I think you don't.

If you would prefer just the number of remaining conflicts, I can do
that instead.