Mercurial > evolve

comparison tests/test-evolve-content-divergent-interrupted.t @ 4578:75e76141cba2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add --no-all to hg evolve to reduce test changes
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 24 Apr 2019 16:35:01 +0800
parents d02a7c8cdee5
children 61c2518cd6d2
comparison
equal deleted inserted replaced
4577:bcd52ce0916d 4578:75e76141cba2
77 o 1:c7586e2a9264 added a 77 o 1:c7586e2a9264 added a
78 | () draft 78 | () draft
79 o 0:8fa14d15e168 added hgignore 79 o 0:8fa14d15e168 added hgignore
80 () draft 80 () draft
81 81
82 $ hg evolve --content-divergent 82 $ hg evolve --content-divergent --no-all
83 merge:[6] added d 83 merge:[6] added d
84 with: [5] added d 84 with: [5] added d
85 base: [4] added d 85 base: [4] added d
86 merging "other" content-divergent changeset 'e49523854bc8' 86 merging "other" content-divergent changeset 'e49523854bc8'
87 merging d 87 merging d
445 o 1:c7586e2a9264 added a 445 o 1:c7586e2a9264 added a
446 | () draft 446 | () draft
447 o 0:8fa14d15e168 added hgignore 447 o 0:8fa14d15e168 added hgignore
448 () draft 448 () draft
449 449
450 $ hg evolve --content-divergent 450 $ hg evolve --content-divergent --no-all
451 merge:[6] added d 451 merge:[6] added d
452 with: [5] added d 452 with: [5] added d
453 base: [4] added d 453 base: [4] added d
454 merging "other" content-divergent changeset 'e49523854bc8' 454 merging "other" content-divergent changeset 'e49523854bc8'
455 merging d 455 merging d