Mercurial > evolve

comparison tests/test-evolve-abort-phasediv.t @ 6401:716912541759 mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 07 Feb 2023 10:51:10 +0400
parents e82ad19eb3cc e5bd76f95145
children
comparison
equal deleted inserted replaced
6355:4cf673319dfc 6401:716912541759
21 21
22 $ cat >> $HGRCPATH <<EOF 22 $ cat >> $HGRCPATH <<EOF
23 > [alias] 23 > [alias]
24 > abort = evolve --abort 24 > abort = evolve --abort
25 > EOF 25 > EOF
26
27 #testcases inmemory ondisk
28 #if inmemory
29 $ cat >> $HGRCPATH <<EOF
30 > [experimental]
31 > evolution.in-memory = yes
32 > EOF
33 #endif
34 26
35 $ hg init abortrepo 27 $ hg init abortrepo
36 $ cd abortrepo 28 $ cd abortrepo
37 $ echo ".*\.orig" > .hgignore 29 $ echo ".*\.orig" > .hgignore
38 $ hg add .hgignore 30 $ hg add .hgignore
297 $ hg resolve -m 289 $ hg resolve -m
298 (no more unresolved files) 290 (no more unresolved files)
299 continue: hg evolve --continue 291 continue: hg evolve --continue
300 $ hg evolve --continue 292 $ hg evolve --continue
301 evolving 9:28cd06b3f801 "added c" 293 evolving 9:28cd06b3f801 "added c"
302 committed as 95d746965290 294 committed as 92acf49069a4
303 recreate:[10] added d 295 recreate:[10] added d
304 atop:[4] added d 296 atop:[4] added d
305 rebasing to destination parent: ca1b80f7960a 297 rebasing to destination parent: ca1b80f7960a
306 merging c 298 merging c
307 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 299 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')