comparison tests/test-exchange-obsmarkers-case-D3.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
comparison
equal deleted inserted replaced
5635:a34b5cf906c6 5636:3f9ef377e670
55 $ hg up -q 0 55 $ hg up -q 0
56 $ mkcommit B 56 $ mkcommit B
57 created new head 57 created new head
58 $ mkcommit A1 58 $ mkcommit A1
59 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` 59 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
60 1 new obsolescence markers
61 obsoleted 1 changesets 60 obsoleted 1 changesets
62 $ hg prune -d '0 0' . 61 $ hg prune -d '0 0' .
63 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 62 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
64 working directory is now at 35b183996678 63 working directory is now at 35b183996678
65 1 changesets pruned 64 1 changesets pruned