Mercurial > evolve
comparison tests/test-evolve-stop-phasediv.t @ 5666:e5d91fd1f319
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 | b6c819facbe8 |
| children | 8e4f6354b316 c5dfbbe4363d |
comparison
equal
deleted
inserted
replaced
| 5665:dd9dba7c1d00 | 5666:e5d91fd1f319 |
|---|---|
| 84 rebasing to destination parent: ca1b80f7960a | 84 rebasing to destination parent: ca1b80f7960a |
| 85 merging c | 85 merging c |
| 86 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 86 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 87 unresolved merge conflicts | 87 unresolved merge conflicts |
| 88 (see 'hg help evolve.interrupted') | 88 (see 'hg help evolve.interrupted') |
| 89 [1] | 89 [240] |
| 90 | 90 |
| 91 $ hg evolve --stop | 91 $ hg evolve --stop |
| 92 stopped the interrupted evolve | 92 stopped the interrupted evolve |
| 93 working directory is now at ca1b80f7960a | 93 working directory is now at ca1b80f7960a |
| 94 | 94 |