Repeated merges possible and displayed in brzr status

[John Arbash Meinel]

Matiyam wrote:
> 
> John A Meinel wrote:
> 
>>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.
>>
> 
> 
> I am sorry, but i don't understand why this is not a common case. What
> would be the proper way to do that in bzr? Using an integration branch?
> 
> Thanks a lot for your attention and your great job!!
> 
> -- M
> 
> 

It is uncommon to have 2 branches be identical without having merged
them together already. As long as there is a difference, merge would
work correctly, since something would change.

It is also possible that Aaron would do things differently, and just
check who base is, and if base == target, then don't set pending-merges.
I'm not sure how he plans to implement it.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051019/3408bb82/attachment.pgp