[BUG] No-op merge broken

[Aaron Bentley]

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

John Arbash Meinel wrote:
> 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 don't think I would have tried to catch that case.

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

That's when you do a merge when the merge target is already merged.
Like if you merge, commit, merge.  The message just means BASE==OTHER.

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

I don't feel strongly about permitting or forbidding such merges.  I
suppose you could use such empty merging as proof that someone had
signed off on your changes, or something.  But if no files were changed,
you'll probably revert it.

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

iD8DBQFFJZji0F+nu1YWqI0RAsAsAJ9brIROleARxKQ2V/xHYNVrvgC22gCeIPhz
pRgxwHzregFiIA5hSsr8k4Y=
=Tu4O
-----END PGP SIGNATURE-----