Mercurial > evolve

comparison tests/test-evolve-content-divergent-meta.t @ 4673:3ef4980353af 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 Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 05 Jun 2019 17:45:45 +0200
parents c0e9a3c01c44
children 79bc0f1a832e 1752a2e7a226
comparison
equal deleted inserted replaced
4672:653c42af172e 4673:3ef4980353af
110 > hg ci -m "added "$ch 110 > hg ci -m "added "$ch
111 > done; 111 > done;
112 112
113 $ hg amend -m "updated c" 113 $ hg amend -m "updated c"
114 $ hg up -r 'desc("added c")' --hidden -q 114 $ hg up -r 'desc("added c")' --hidden -q
115 updated to hidden changeset 2b3c31fe982d 115 updating to a hidden changeset 2b3c31fe982d
116 (hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0) 116 (hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0)
117 working directory parent is obsolete! (2b3c31fe982d) 117 working directory parent is obsolete! (2b3c31fe982d)
118 $ echo coco > c 118 $ echo coco > c
119 119
120 1) when one user is different wrt base 120 1) when one user is different wrt base