Mercurial > evolve
diff tests/test-single-head-obsolescence-topic-B5.t @ 6186:c915d9441654 mercurial-5.1
test-compat: merge mercurial-5.2 into mercurial-5.1
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Tue, 22 Feb 2022 18:14:26 +0300 |
parents | 35e769c9604f |
children | b1d010b2e6c4 |
line wrap: on
line diff
--- a/tests/test-single-head-obsolescence-topic-B5.t Tue Feb 22 17:34:31 2022 +0300 +++ b/tests/test-single-head-obsolescence-topic-B5.t Tue Feb 22 18:14:26 2022 +0300 @@ -80,7 +80,6 @@ $ mkcommit A1 $ mkcommit B1 $ hg debugobsolete `getid "desc(M0)"` --record-parents - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg log -G --hidden @@ -108,6 +107,7 @@ pushing to $TESTTMP/B5/server searching for changes no changes found + 1 new obsolescence markers transaction abort! rollback completed abort: rejecting multiple heads on branch "default:topic-X"