Mercurial > evolve

comparison tests/test-evolve-content-divergent-first-changeset.t @ 5091:308c1e09f80f mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.7 into mercurial-4.6
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 23 Jan 2020 17:40:59 +0700
parents 946ebd8f08ea
children 1752a2e7a226
comparison
equal deleted inserted replaced
5090:2631e735ec16 5091:308c1e09f80f
18 $ hg amend -m div1 18 $ hg amend -m div1
19 $ hg log -T '{node|short}\n' 19 $ hg log -T '{node|short}\n'
20 79fa0eb22d65 20 79fa0eb22d65
21 21
22 $ hg up be090ea66256 --hidden --quiet 22 $ hg up be090ea66256 --hidden --quiet
23 updated to hidden changeset be090ea66256 23 updating to a hidden changeset be090ea66256
24 (hidden revision 'be090ea66256' was rewritten as: 79fa0eb22d65) 24 (hidden revision 'be090ea66256' was rewritten as: 79fa0eb22d65)
25 working directory parent is obsolete! (be090ea66256) 25 working directory parent is obsolete! (be090ea66256)
26 $ echo a >> test 26 $ echo a >> test
27 $ echo b >> test 27 $ echo b >> test
28 $ hg amend -m div2 28 $ hg amend -m div2