Mercurial > evolve

comparison tests/test-evolve.t @ 3983:a689f07d5663

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 21 Aug 2018 04:08:38 +0200
parents 8fcee1e65e29 fb8e44c70798
children 25981fae92f9
comparison
equal deleted inserted replaced
3982:7b1af75e12a9 3983:a689f07d5663
1474 $ glog -r "be23044af550::" --hidden 1474 $ glog -r "be23044af550::" --hidden
1475 @ 38:61abd81de026@default(draft) will be evolved safely 1475 @ 38:61abd81de026@default(draft) will be evolved safely
1476 | 1476 |
1477 o 37:df89d30f23e2@default(draft) amended 1477 o 37:df89d30f23e2@default(draft) amended
1478 | 1478 |
1479 | * 36:59c37c5bebd1@default(draft) will cause conflict at evolve 1479 | @ 36:59c37c5bebd1@default(draft) will cause conflict at evolve
1480 | | 1480 | |
1481 | x 35:7cc12c6c7862@default(draft) will be evolved safely 1481 | x 35:7cc12c6c7862@default(draft) will be evolved safely
1482 | | 1482 | |
1483 | x 34:98c7ab460e6b@default(draft) will be amended 1483 | x 34:98c7ab460e6b@default(draft) will be amended
1484 |/ 1484 |/