Repeated merges possible and displayed in brzr status

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> 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.

I was thinking of

if not target in branch.ancestry(branch.last_revision()):
    branch.add_pending_merge(target)

I'm not trying to prevent the merge-bounce issue, where you merge a into
b, commit, merge b into a, commit, merge a into b...

That can be solved with bzr pull:
merge a into b, commit, pull b into a.

Though perhaps if a merge makes no file changes and pull would work, we
should error out and suggest pull.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDVlIW0F+nu1YWqI0RAmLzAJ4yecAvU10jY+SMng65rAvC3g+WAgCeLNMw
G1ogXOw6aGiFhaIrmEmr4Jw=
=futY
-----END PGP SIGNATURE-----