Mercurial > evolve

comparison tests/test-tutorial.t @ 803:b96d51a357bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: get rid of all reference to conflicting changesets They are now called divergent for a long time.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 20 Feb 2014 13:32:04 -0800
parents 03844e1fbfe6
children c2bf0eb727f1 6a67606e1c34
comparison
equal deleted inserted replaced
802:80e078959129 803:b96d51a357bd
824 824
825 825
826 Handling Divergent amend 826 Handling Divergent amend
827 ---------------------------------------------- 827 ----------------------------------------------
828 828
829 We can detect that multiple diverging/conflicting amendments have been made. 829 We can detect that multiple diverging amendments have been made.
830 The `evolve` command can solve this situation. But all corner case are not 830 The `evolve` command can solve this situation. But all corner case are not
831 handled now. 831 handled now.
832 832
833 This section needs to be written. 833 This section needs to be written.