diff tests/test-single-head-obsolescence-topic-B5.t @ 5234:35e769c9604f mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 08 Apr 2020 01:16:53 +0800
parents fa1324e58fcf
children c915d9441654
line wrap: on
line diff
--- a/tests/test-single-head-obsolescence-topic-B5.t	Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-topic-B5.t	Wed Apr 08 01:16:53 2020 +0800
@@ -82,7 +82,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
@@ -110,6 +109,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"