Mercurial > evolve

comparison tests/test-evolve-topic.t @ 4676:b6c819facbe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvecmd: the proper way to deal with conflicts is to resolve them And it's worth making the suggestion an actual hint.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 06 Jun 2019 17:37:42 +0800
parents 48521a49a07e
children 52c1809f35c1
comparison
equal deleted inserted replaced
4669:daab6d665687 4676:b6c819facbe8
424 move:[s2] add ggg 424 move:[s2] add ggg
425 atop:[s1] add fff 425 atop:[s1] add fff
426 move:[s3] add hhh 426 move:[s3] add hhh
427 merging hhh 427 merging hhh
428 warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark') 428 warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark')
429 fix conflicts and see `hg help evolve.interrupted` 429 unresolved merge conflicts
430 (see 'hg help evolve.interrupted')
430 [1] 431 [1]
431 $ echo "resolved hhh" > hhh 432 $ echo "resolved hhh" > hhh
432 $ hg resolve --mark hhh 433 $ hg resolve --mark hhh
433 (no more unresolved files) 434 (no more unresolved files)
434 continue: hg evolve --continue 435 continue: hg evolve --continue