diff tests/test-push-checkheads-unpushed-D4.t @ 3108:9c9c8c1eeb93 mercurial-4.2

test-compat: merge with mercurial-4.3 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 18:34:22 +0200
parents 2280461343e5 ccfcacc5ee7c
children 7a5c3175015e
line wrap: on
line diff
--- a/tests/test-push-checkheads-unpushed-D4.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D4.t	Fri Oct 20 18:34:22 2017 +0200
@@ -82,9 +82,7 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  d70a1f75a020 (draft): B1
   |
@@ -120,6 +118,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../..