Mercurial > evolve

comparison tests/test-evolve-continue.t @ 6066:34f5c849fc1d mercurial-5.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.6 into mercurial-5.5 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 11:53:21 +0300
parents 9b1bdd68d545 c0921b5277a0
children e5bd76f95145
comparison
equal deleted inserted replaced
6065:c0921b5277a0 6066:34f5c849fc1d
8 > [extensions] 8 > [extensions]
9 > rebase = 9 > rebase =
10 > evolve = 10 > evolve =
11 > EOF 11 > EOF
12 12
13 #testcases inmemory ondisk
14 #if inmemory
15 $ cat >> $HGRCPATH <<EOF
16 > [experimental]
17 > evolution.in-memory = yes
18 > EOF
19 #endif
20
21 Setting up the repo 13 Setting up the repo
22 14
23 $ hg init repo 15 $ hg init repo
24 $ cd repo 16 $ cd repo
25 $ echo ".*\.orig" > .hgignore 17 $ echo ".*\.orig" > .hgignore
62 () draft 54 () draft
63 55
64 $ hg evolve --all 56 $ hg evolve --all
65 move:[4] added d 57 move:[4] added d
66 atop:[5] added c 58 atop:[5] added c
67 merging d (inmemory !)
68 hit merge conflicts; retrying merge in working copy (inmemory !)
69 merging d 59 merging d
70 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
71 unresolved merge conflicts 61 unresolved merge conflicts
72 (see 'hg help evolve.interrupted') 62 (see 'hg help evolve.interrupted')
73 [1] 63 [1]
124 () draft 114 () draft
125 115
126 $ hg evolve --update 116 $ hg evolve --update
127 move:[7] added e 117 move:[7] added e
128 atop:[8] added d 118 atop:[8] added d
129 merging e (inmemory !)
130 hit merge conflicts; retrying merge in working copy (inmemory !)
131 merging e 119 merging e
132 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') 120 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
133 unresolved merge conflicts 121 unresolved merge conflicts
134 (see 'hg help evolve.interrupted') 122 (see 'hg help evolve.interrupted')
135 [1] 123 [1]
166 3 new orphan changesets 154 3 new orphan changesets
167 155
168 $ hg evolve --all --update 156 $ hg evolve --all --update
169 move:[2] added b 157 move:[2] added b
170 atop:[9] added a 158 atop:[9] added a
171 merging b (inmemory !)
172 hit merge conflicts; retrying merge in working copy (inmemory !)
173 merging b 159 merging b
174 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 160 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
175 unresolved merge conflicts 161 unresolved merge conflicts
176 (see 'hg help evolve.interrupted') 162 (see 'hg help evolve.interrupted')
177 [1] 163 [1]
253 239
254 $ hg evolve --all --update 240 $ hg evolve --all --update
255 move:[12] added d 241 move:[12] added d
256 atop:[16] added c 242 atop:[16] added c
257 move:[13] added f 243 move:[13] added f
258 merging f (inmemory !)
259 hit merge conflicts; retrying merge in working copy (inmemory !)
260 merging f 244 merging f
261 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') 245 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
262 unresolved merge conflicts 246 unresolved merge conflicts
263 (see 'hg help evolve.interrupted') 247 (see 'hg help evolve.interrupted')
264 [1] 248 [1]
270 $ hg evolve --continue 254 $ hg evolve --continue
271 evolving 13:be88f889b6dc "added f" 255 evolving 13:be88f889b6dc "added f"
272 move:[14] added g 256 move:[14] added g
273 atop:[18] added f 257 atop:[18] added f
274 move:[15] added h 258 move:[15] added h
275 merging h (inmemory !)
276 hit merge conflicts; retrying merge in working copy (inmemory !)
277 merging h 259 merging h
278 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') 260 warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
279 unresolved merge conflicts 261 unresolved merge conflicts
280 (see 'hg help evolve.interrupted') 262 (see 'hg help evolve.interrupted')
281 [1] 263 [1]
319 > y 301 > y
320 > EOF 302 > EOF
321 move:[19] added g 303 move:[19] added g
322 atop:[21] added f 304 atop:[21] added f
323 perform evolve? [Ny] y 305 perform evolve? [Ny] y
324 merging g (inmemory !)
325 hit merge conflicts; retrying merge in working copy (inmemory !)
326 merging g 306 merging g
327 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') 307 warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
328 unresolved merge conflicts 308 unresolved merge conflicts
329 (see 'hg help evolve.interrupted') 309 (see 'hg help evolve.interrupted')
330 [1] 310 [1]
370 2 new orphan changesets 350 2 new orphan changesets
371 351
372 $ hg next --evolve 352 $ hg next --evolve
373 move:[22] added g 353 move:[22] added g
374 atop:[24] added f 354 atop:[24] added f
375 merging g (inmemory !)
376 hit merge conflicts; retrying merge in working copy (inmemory !)
377 merging g 355 merging g
378 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') 356 warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
379 unresolved merge conflicts 357 unresolved merge conflicts
380 (see 'hg help evolve.interrupted') 358 (see 'hg help evolve.interrupted')
381 [1] 359 [1]
439 417
440 418
441 $ hg evolve 419 $ hg evolve
442 move:[3] added d, modified c 420 move:[3] added d, modified c
443 atop:[5] added c 421 atop:[5] added c
444 merging c (inmemory !)
445 hit merge conflicts; retrying merge in working copy (inmemory !)
446 merging c 422 merging c
447 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 423 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
448 unresolved merge conflicts 424 unresolved merge conflicts
449 (see 'hg help evolve.interrupted') 425 (see 'hg help evolve.interrupted')
450 [1] 426 [1]