Mercurial > hg
comparison tests/test-histedit-edit.t @ 42052:15d2afa31e57
histedit: narrow the scope of discarded ui output
In 34165875fa5df813bec3a0cd348932b304d44efb, a lot of the output from
histedit was excluded. This slightly adjusts the scope of that exclusion,
to both discard more uninsteresting messages, and ensure that pre-merge-tool
output gets shown before the external merge tool is executed.
Differential Revision: https://phab.mercurial-scm.org/D6177
| author | Rodrigo Damazio Bovendorp <rdamazio@google.com> |
|---|---|
| date | Mon, 01 Apr 2019 19:02:24 -0700 |
| parents | 57c462db87fd |
| children | c6d31e659a28 |
comparison
equal
deleted
inserted
replaced
| 42051:f4147ca63d39 | 42052:15d2afa31e57 |
|---|---|
| 431 $ hg phase -fdr0 | 431 $ hg phase -fdr0 |
| 432 $ hg histedit --commands - 0 2>&1 << EOF | 432 $ hg histedit --commands - 0 2>&1 << EOF |
| 433 > edit cb9a9f314b8b a > $EDITED | 433 > edit cb9a9f314b8b a > $EDITED |
| 434 > EOF | 434 > EOF |
| 435 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 435 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 436 adding a | |
| 437 Editing (cb9a9f314b8b), you may commit or record as needed now. | 436 Editing (cb9a9f314b8b), you may commit or record as needed now. |
| 438 (hg histedit --continue to resume) | 437 (hg histedit --continue to resume) |
| 439 [1] | 438 [1] |
| 440 $ HGEDITOR=true hg histedit --continue | 439 $ HGEDITOR=true hg histedit --continue |
| 441 saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg | 440 saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg |