Mercurial > evolve
comparison tests/test-evolve-progress.t @ 5714:b3d9e6c805d6 stable
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 | 6eb9f82b43ba |
| children | 61d2f1cf90f0 |
comparison
equal
deleted
inserted
replaced
| 5713:c3c870f3b98e | 5714:b3d9e6c805d6 |
|---|---|
| 134 picked tool ':merge' for a (binary False symlink False changedelete False) | 134 picked tool ':merge' for a (binary False symlink False changedelete False) |
| 135 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b | 135 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b |
| 136 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 136 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 137 unresolved merge conflicts | 137 unresolved merge conflicts |
| 138 (see 'hg help evolve.interrupted') | 138 (see 'hg help evolve.interrupted') |
| 139 [1] | 139 [240] |
| 140 $ echo resolved > a | 140 $ echo resolved > a |
| 141 $ hg resolve -m a | 141 $ hg resolve -m a |
| 142 (no more unresolved files) | 142 (no more unresolved files) |
| 143 continue: hg evolve --continue | 143 continue: hg evolve --continue |
| 144 $ hg evolve --continue --config progress.debug=yes --debug | 144 $ hg evolve --continue --config progress.debug=yes --debug |