so i've attached another even simpler (imo) way to reproduce this bug imo. make a branch of a trunk branch or checkout. add a revision to the trunk. merge it to the branch, revert the merge, and try to merge again.
so i've attached another even simpler (imo) way to reproduce this bug imo. make a branch of a trunk branch or checkout. add a revision to the trunk. merge it to the branch, revert the merge, and try to merge again.