changeset 41954 | e1ceefab9bca |
parent 41953 | dd1ab72be983 |
child 42100 | b63b8b7ca5fa |
--- a/tests/test-rebase-inmemory.t Thu Mar 14 13:53:20 2019 -0700 +++ b/tests/test-rebase-inmemory.t Thu Mar 14 14:46:29 2019 -0700 @@ -756,5 +756,7 @@ | o 0: b173517d0057 'a' - $ hg rebase -b 5 -d tip 2>&1 | grep '** ProgrammingError' - ** ProgrammingError: markcopied() called on clean context + $ hg rebase -b 5 -d tip + rebasing 3:ca58782ad1e4 "b" + rebasing 5:71cb43376053 "merge" + note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes