comparison tests/test-push-checkheads-unpushed-D2.t @ 5636:3f9ef377e670 mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 31 Oct 2020 19:10:55 +0800
parents f3e39a354378
children 9f69164cdc16 669270305ccb
comparison
equal deleted inserted replaced
5635:a34b5cf906c6 5636:3f9ef377e670
62 $ hg up 0 62 $ hg up 0
63 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 63 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
64 $ mkcommit A1 64 $ mkcommit A1
65 created new head 65 created new head
66 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 66 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
67 1 new obsolescence markers
68 obsoleted 1 changesets 67 obsoleted 1 changesets
69 1 new orphan changesets 68 1 new orphan changesets
70 $ hg debugobsolete --record-parents `getid "desc(B0)"` 69 $ hg debugobsolete --record-parents `getid "desc(B0)"`
71 1 new obsolescence markers
72 obsoleted 1 changesets 70 obsoleted 1 changesets
73 $ hg up 0 71 $ hg up 0
74 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 72 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
75 $ mkcommit C0 73 $ mkcommit C0
76 created new head 74 created new head