diff tests/test-exchange-obsmarkers-case-B5.t @ 3930:d00f0c369bc7 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 02:47:44 +0200
parents d5adce52cef4
children 98941c28f3e2 e268f7fd7839
line wrap: on
line diff
--- a/tests/test-exchange-obsmarkers-case-B5.t	Thu Aug 02 02:42:15 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B5.t	Thu Aug 02 02:47:44 2018 +0200
@@ -71,7 +71,6 @@
   $ mkcommit B1
   $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
-  2 new orphan changesets
   $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
   $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
   obsoleted 1 changesets
@@ -81,7 +80,7 @@
   |
   @  e5ea8f9c7314 (draft): A1
   |
-  | *  1d0f3cd25300 (draft): C
+  | o  1d0f3cd25300 (draft): C
   | |
   | x  6e72f0a95b5e (draft): B0
   | |