Mercurial > evolve

comparison tests/test-evolve-phase-divergence.t @ 5997:43c4db536990 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 12 Aug 2021 22:00:49 +0200
parents 03410b04cf10 254e135b46ef
children c0921b5277a0
comparison
equal deleted inserted replaced
5939:0511ad9f0862 5997:43c4db536990
192 recreate:[2] tweak a 192 recreate:[2] tweak a
193 atop:[1] modify a 193 atop:[1] modify a
194 hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e; 194 hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e;
195 hg update 4d1169d82e47; 195 hg update 4d1169d82e47;
196 hg revert --all --rev 98bb3a6cfe1a; 196 hg revert --all --rev 98bb3a6cfe1a;
197 hg commit --msg "phase-divergent update to 98bb3a6cfe1a" 197 hg commit --message "phase-divergent update to 98bb3a6cfe1a"
198 198
199 XXX: evolve should have mentioned that draft commit is just obsoleted in favour 199 XXX: evolve should have mentioned that draft commit is just obsoleted in favour
200 of public one. From the message it looks like a new commit is created. 200 of public one. From the message it looks like a new commit is created.
201 201
202 $ hg evolve --phase-divergent --update 202 $ hg evolve --phase-divergent --update