branch | stable |
changeset 4860 | 015cdd3fa469 |
parent 4840 | 62b60fc1983d |
child 4871 | a8ff17479fb8 |
--- a/tests/test-exchange-obsmarkers-case-C4.t Fri Sep 27 12:48:44 2019 +0200 +++ b/tests/test-exchange-obsmarkers-case-C4.t Fri Sep 27 12:49:15 2019 +0200 @@ -65,10 +65,8 @@ $ 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