[BUG] No-op merge broken

[John Arbash Meinel]

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

I haven't tracked into it, but there was an old discussion on IRC that I
missed until today. Basically it mentioned that after merging and
committing, if you merge back into the other branch, you can commit
that, and ping-pong ad nauseum.

I thought I remembered the second merge used to state 'Nothing to do.'

I tried this with a copy of bzr-0.8, and it still created a no-change
merge, so if this an actual bug, it was made a while ago.

Are we intending to add logic to avoid ping-pong merging? (I know we
have 'bzr pull' but that loses branch identity)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFJO7aJdeBCYSNAAMRAkQ5AKCo46td8GPukwpyQFUErF7x84mVtQCghqOa
5FOJF5GyUNZQfE099vweYUk=
=tXoO
-----END PGP SIGNATURE-----