tests/test-exchange-obsmarkers-case-C4.t
changeset 35709 1a09dad8b85a
parent 33542 b11e8c67fb0f
child 42899 34a46d48d24e
equal deleted inserted replaced
35708:03e921942163 35709:1a09dad8b85a
    65   $ mkcommit C
    65   $ mkcommit C
    66   created new head
    66   created new head
    67   $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
    67   $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
    68   obsoleted 1 changesets
    68   obsoleted 1 changesets
    69   $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
    69   $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
       
    70   2 new content-divergent changesets
    70   $ hg prune -qd '0 0' .
    71   $ hg prune -qd '0 0' .
    71   $ hg log -G --hidden
    72   $ hg log -G --hidden
    72   x  7f7f229b13a6 (draft): C
    73   x  7f7f229b13a6 (draft): C
    73   |
    74   |
    74   | o  35b183996678 (draft): B
    75   | o  35b183996678 (draft): B