Mercurial > evolve

comparison tests/test-evolve-public-content-divergent-main.t @ 5834:c2484b0217ee 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 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 14:49:22 +0800
parents 0f32359bcf3e
children
comparison
equal deleted inserted replaced
5833:be8f7eb3f3a0 5834:c2484b0217ee
48 $ hg phase --public 48 $ hg phase --public
49 49
50 Amend again to create a cset divergent to public one: 50 Amend again to create a cset divergent to public one:
51 51
52 $ hg up 1 --hidden -q 52 $ hg up 1 --hidden -q
53 updated to hidden changeset 5f6d8a4bf34a 53 updating to a hidden changeset 5f6d8a4bf34a
54 (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f) 54 (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f)
55 working directory parent is obsolete! (5f6d8a4bf34a) 55 working directory parent is obsolete! (5f6d8a4bf34a)
56 56
57 $ echo "I am second" >> b 57 $ echo "I am second" >> b
58 $ hg ci --amend -m "updated b" 58 $ hg ci --amend -m "updated b"
142 $ hg phase --public 142 $ hg phase --public
143 143
144 Amend again to create a cset divergent to public one: 144 Amend again to create a cset divergent to public one:
145 145
146 $ hg up 1 --hidden -q 146 $ hg up 1 --hidden -q
147 updated to hidden changeset 5f6d8a4bf34a 147 updating to a hidden changeset 5f6d8a4bf34a
148 (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c) 148 (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c)
149 working directory parent is obsolete! (5f6d8a4bf34a) 149 working directory parent is obsolete! (5f6d8a4bf34a)
150 150
151 $ echo "I am bar" > b 151 $ echo "I am bar" > b
152 $ hg ci --amend -m "updated b" 152 $ hg ci --amend -m "updated b"