Mercurial > evolve

comparison tests/test-evolve-phase.t @ 5825:9b1bdd68d545 mercurial-5.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove in-memory evolve cases (not supported prior to 5.6)
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 12:51:00 +0800
parents fd039a7f0c3c
children 664f62e57231 e5bd76f95145
comparison
equal deleted inserted replaced
5824:73573aec18f7 5825:9b1bdd68d545
6 > [alias] 6 > [alias]
7 > glog = log -G --template='{rev} - {node|short} {desc} ({phase})\n' 7 > glog = log -G --template='{rev} - {node|short} {desc} ({phase})\n'
8 > [extensions] 8 > [extensions]
9 > EOF 9 > EOF
10 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH 10 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
11
12 #testcases inmemory ondisk
13 #if inmemory
14 $ cat >> $HGRCPATH <<EOF
15 > [experimental]
16 > evolution.in-memory = yes
17 > EOF
18 #endif
19 11
20 Testing when there are no conflicts during evolve 12 Testing when there are no conflicts during evolve
21 13
22 $ hg init noconflict 14 $ hg init noconflict
23 $ cd noconflict 15 $ cd noconflict
89 o 0 - cb9a9f314b8b a (draft) 81 o 0 - cb9a9f314b8b a (draft)
90 82
91 $ hg evolve 83 $ hg evolve
92 move:[2] c 84 move:[2] c
93 atop:[3] b 85 atop:[3] b
94 merging a (inmemory !)
95 hit merge conflicts; retrying merge in working copy (inmemory !)
96 merging a 86 merging a
97 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 87 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
98 unresolved merge conflicts 88 unresolved merge conflicts
99 (see 'hg help evolve.interrupted') 89 (see 'hg help evolve.interrupted')
100 [1] 90 [1]