comparison tests/test-evolve.t @ 6065:c0921b5277a0 mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 11:32:36 +0300
parents fd039a7f0c3c 1a13ac9ef30a
children 34f5c849fc1d 171d13d8f0ce
comparison
equal deleted inserted replaced
6064:28a77df6e41f 6065:c0921b5277a0
459 o 0 459 o 0
460 460
461 461
462 462
463 (/ninja) 463 (/ninja)
464
465 command-templates.oneline-summary is respected when evolving orphan
466
467 $ hg evolve -n --config 'command-templates.oneline-summary = custom {rev} {desc}'
468 move:custom 8 dansk 2!
469 atop:custom 10 dansk!
470 hg rebase -r 569625323d3e -d 9975c016fe7b
471 skipping 8163b3ed62c7, consider including orphan ancestors
472
473 command-templates.oneline-summary is respected when evolving/updating working copy
474
475 $ hg co -q 7
476 working directory parent is obsolete! (aca219761afb)
477 $ hg evolve --no-all --config 'command-templates.oneline-summary = custom {rev} {desc}'
478 update:custom 10 dansk!
479 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
480 working directory is now at 9975c016fe7b
481 464
482 $ hg evolve --all --traceback 465 $ hg evolve --all --traceback
483 move:[8] dansk 2! 466 move:[8] dansk 2!
484 atop:[10] dansk! 467 atop:[10] dansk!
485 merging main-file-1 468 merging main-file-1
645 $ hg pick -r 7 628 $ hg pick -r 7
646 picking 7:a5bfd90a2f29 "conflict" 629 picking 7:a5bfd90a2f29 "conflict"
647 merging 1 630 merging 1
648 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') 631 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
649 unresolved merge conflicts (see hg help resolve) 632 unresolved merge conflicts (see hg help resolve)
650 [240] 633 [1]
651 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' 634 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
652 7:a5bfd90a2f29 635 7:a5bfd90a2f29
653 $ echo 3 > 1 636 $ echo 3 > 1
654 $ hg resolve -m 1 637 $ hg resolve -m 1
655 (no more unresolved files) 638 (no more unresolved files)
1171 > evolution=createmarkers 1154 > evolution=createmarkers
1172 > EOF 1155 > EOF
1173 $ hg next 1156 $ hg next
1174 hg: unknown command 'next' 1157 hg: unknown command 'next'
1175 (use 'hg help' for a list of commands) 1158 (use 'hg help' for a list of commands)
1176 [10] 1159 [255]
1177 $ hg fold 1160 $ hg fold
1178 hg: unknown command 'fold' 1161 hg: unknown command 'fold'
1179 (use 'hg help' for a list of commands) 1162 (use 'hg help' for a list of commands)
1180 [10] 1163 [255]
1181 Enabling commands selectively, only fold enabled, next is still unknown 1164 Enabling commands selectively, only fold enabled, next is still unknown
1182 $ cat >> $HGRCPATH <<EOF 1165 $ cat >> $HGRCPATH <<EOF
1183 > [experimental] 1166 > [experimental]
1184 > evolution=createmarkers 1167 > evolution=createmarkers
1185 > evolutioncommands=fold 1168 > evolutioncommands=fold
1188 abort: no revisions specified 1171 abort: no revisions specified
1189 [255] 1172 [255]
1190 $ hg next 1173 $ hg next
1191 hg: unknown command 'next' 1174 hg: unknown command 'next'
1192 (use 'hg help' for a list of commands) 1175 (use 'hg help' for a list of commands)
1193 [10] 1176 [255]
1194 1177
1195 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled 1178 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
1196 1179
1197 $ hg --hidden up 14 1180 $ hg --hidden up 14
1198 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1181 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1413 hit merge conflicts; retrying merge in working copy (inmemory !) 1396 hit merge conflicts; retrying merge in working copy (inmemory !)
1414 merging newfile 1397 merging newfile
1415 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') 1398 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
1416 unresolved merge conflicts 1399 unresolved merge conflicts
1417 (see 'hg help evolve.interrupted') 1400 (see 'hg help evolve.interrupted')
1418 [240] 1401 [1]
1419 1402
1420 $ glog -r "desc('add unstableifparentisfolded')::" --hidden 1403 $ glog -r "desc('add unstableifparentisfolded')::" --hidden
1421 @ 33:b9acdb1af6d5@default(draft) will be evolved safely 1404 @ 33:b9acdb1af6d5@default(draft) will be evolved safely
1422 | 1405 |
1423 o 32:6ec468e4cb98@default(draft) amended 1406 o 32:6ec468e4cb98@default(draft) amended