add tests for rebasing with patch-equivalence present