diff tests/test-push-checkheads-unpushed-D4.t @ 4892:38079b848657

branching: merge back into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 05 Oct 2019 14:31:19 -0400
parents a8ff17479fb8
children f3e39a354378 12c53d7122a7
line wrap: on
line diff
--- a/tests/test-push-checkheads-unpushed-D4.t	Mon Oct 07 14:38:56 2019 +0700
+++ b/tests/test-push-checkheads-unpushed-D4.t	Sat Oct 05 14:31:19 2019 -0400
@@ -83,9 +83,11 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+  1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  d70a1f75a020 (draft): B1