Mercurial > evolve

comparison tests/test-evolve.t @ 5666:e5d91fd1f319

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update with more detailed exit codes CORE-TEST-OUTPUT-UPDATE: 21733e8c924f CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0 CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c CORE-TEST-OUTPUT-UPDATE: ebee234d952a CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60 CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b CORE-TEST-OUTPUT-UPDATE: f96fa4de5055 CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 19 Nov 2020 08:28:45 -0800
parents b2de5825e5ca
children 8c7de8f8bb42 ceaa85c47973
comparison
equal deleted inserted replaced
5665:dd9dba7c1d00 5666:e5d91fd1f319
626 $ hg pick -r 7 626 $ hg pick -r 7
627 picking 7:a5bfd90a2f29 "conflict" 627 picking 7:a5bfd90a2f29 "conflict"
628 merging 1 628 merging 1
629 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') 629 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
630 unresolved merge conflicts (see hg help resolve) 630 unresolved merge conflicts (see hg help resolve)
631 [1] 631 [240]
632 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' 632 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
633 7:a5bfd90a2f29 633 7:a5bfd90a2f29
634 $ echo 3 > 1 634 $ echo 3 > 1
635 $ hg resolve -m 1 635 $ hg resolve -m 1
636 (no more unresolved files) 636 (no more unresolved files)
1392 move:[31] will cause conflict at evolve 1392 move:[31] will cause conflict at evolve
1393 merging newfile 1393 merging newfile
1394 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') 1394 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
1395 unresolved merge conflicts 1395 unresolved merge conflicts
1396 (see 'hg help evolve.interrupted') 1396 (see 'hg help evolve.interrupted')
1397 [1] 1397 [240]
1398 1398
1399 $ glog -r "desc('add unstableifparentisfolded')::" --hidden 1399 $ glog -r "desc('add unstableifparentisfolded')::" --hidden
1400 @ 33:b9acdb1af6d5@default(draft) will be evolved safely 1400 @ 33:b9acdb1af6d5@default(draft) will be evolved safely
1401 | 1401 |
1402 o 32:6ec468e4cb98@default(draft) amended 1402 o 32:6ec468e4cb98@default(draft) amended