Comment 3 for bug 235407

Revision history for this message
John A Meinel (jameinel) wrote :

You don't need a merge directive to reproduce this. double merging will do it

bzr init X
bzr commit --unchanged -m 1 X
bzr branch X Y
bzr commit --unchanged -m 2 Y
cd X
bzr merge ../Y
bzr merge --force ../Y

Arguably, merge should refuse to mark the entry as a new merge if it is in the ancestry of the existing merges. (So that doing bzr merge ../Y; bzr merge --force -r 1 ../Y doesn't work)

Anyway, I'll make a quick fix to 'bzr status' to still allow this, but really it seems like something 'merge' might be doing wrong.