changeset 4840 | 62b60fc1983d |
parent 3566 | e6bea259c227 |
child 4860 | 015cdd3fa469 |
--- a/tests/test-exchange-obsmarkers-case-C4.t Tue Sep 10 07:38:46 2019 +0200 +++ b/tests/test-exchange-obsmarkers-case-C4.t Thu Sep 12 12:35:42 2019 +0200 @@ -65,8 +65,10 @@ $ mkcommit C created new head $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` + 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` + 1 new obsolescence markers 2 new content-divergent changesets $ hg prune -qd '0 0' . $ hg log -G --hidden