Mercurial > evolve

comparison tests/test-exchange-obsmarkers-case-D3.t @ 3167:f089741039e5 mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 01 Nov 2017 23:58:27 +0100
parents 2280461343e5
children 7a5c3175015e
comparison
equal deleted inserted replaced
3166:e1a230cc4527 3167:f089741039e5
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 obsoleted 1 changesets
61 $ hg prune -d '0 0' . 60 $ hg prune -d '0 0' .
62 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 61 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
63 working directory now at 35b183996678 62 working directory now at 35b183996678
64 1 changesets pruned 63 1 changesets pruned
65 $ hg strip --hidden -q 'desc(A1)' --config devel.strip-obsmarkers=no 64 $ hg strip --hidden -q 'desc(A1)' --config devel.strip-obsmarkers=no