Repeated merges possible and displayed in brzr status

[John A Meinel]

> Matiyam wrote:
>> I am not sure if this is a bug, let's hope you can tell me.
> ...
>> Now, if i make another "bzr merge ../main" and "bzr status" in
>> "new-feature", i guess i shouldn't see any change (everything has been
>> merged).
>>
>> BUT i get i line saying:
>> "pending merges: ... (and the last commit from "main".
>
> Yes, that's a bug.  I'll fix it.

I assume you will not set the "pending-merges" field if there are no
changes. But what about the case where both trees have identical contents
(say they merged the same source, or they just happened to make the same
change). At that point you would want to "merge" them, to say that they
have indeed converged.

I would just be careful how it was fixed. I'm not sure that the above use
case is common enough to worry about or not. But I thought I would mention
it.


>
> Aaron

John
=:->