Mercurial > evolve

comparison tests/test-evolve.t @ 3993:85c99079d41f mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 21 Aug 2018 13:25:28 +0200
parents f7afd3a158e3 fb8e44c70798
children 684cc3418ecd eb4d07a0b19f
comparison
equal deleted inserted replaced
3933:1194c850fe2a 3993:85c99079d41f
1541 $ glog -r "be23044af550::" --hidden 1541 $ glog -r "be23044af550::" --hidden
1542 @ 38:61abd81de026@default(draft) will be evolved safely 1542 @ 38:61abd81de026@default(draft) will be evolved safely
1543 | 1543 |
1544 o 37:df89d30f23e2@default(draft) amended 1544 o 37:df89d30f23e2@default(draft) amended
1545 | 1545 |
1546 | * 36:59c37c5bebd1@default(draft) will cause conflict at evolve 1546 | @ 36:59c37c5bebd1@default(draft) will cause conflict at evolve
1547 | | 1547 | |
1548 | x 35:7cc12c6c7862@default(draft) will be evolved safely 1548 | x 35:7cc12c6c7862@default(draft) will be evolved safely
1549 | | 1549 | |
1550 | x 34:98c7ab460e6b@default(draft) will be amended 1550 | x 34:98c7ab460e6b@default(draft) will be amended
1551 |/ 1551 |/