Mercurial > hg
comparison tests/test-histedit-arguments.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 | b6673e9bdcf6 |
children | db5560c07a28 |
comparison
equal
deleted
inserted
replaced
42051:f4147ca63d39 | 42052:15d2afa31e57 |
---|---|
137 ~ | 137 ~ |
138 $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF | 138 $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF |
139 > edit 08d98a8350f3 4 five | 139 > edit 08d98a8350f3 4 five |
140 > EOF | 140 > EOF |
141 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 141 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
142 reverting alpha | |
143 Editing (08d98a8350f3), you may commit or record as needed now. | 142 Editing (08d98a8350f3), you may commit or record as needed now. |
144 (hg histedit --continue to resume) | 143 (hg histedit --continue to resume) |
145 [1] | 144 [1] |
146 | 145 |
147 $ hg graft --continue | 146 $ hg graft --continue |
474 $ hg -q up 8cde254db839 | 473 $ hg -q up 8cde254db839 |
475 $ hg histedit 6f2f0241f119 --commands - <<EOF | 474 $ hg histedit 6f2f0241f119 --commands - <<EOF |
476 > pick 8cde254db839 | 475 > pick 8cde254db839 |
477 > edit 6f2f0241f119 | 476 > edit 6f2f0241f119 |
478 > EOF | 477 > EOF |
479 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
480 merging foo | 478 merging foo |
481 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | 479 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
482 Fix up the change (pick 8cde254db839) | 480 Fix up the change (pick 8cde254db839) |
483 (hg histedit --continue to resume) | 481 (hg histedit --continue to resume) |
484 [1] | 482 [1] |