Mercurial > hg
comparison tests/test-histedit-obsolete.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 | 43d3b09b3e5a |
| children | db5560c07a28 |
comparison
equal
deleted
inserted
replaced
| 42051:f4147ca63d39 | 42052:15d2afa31e57 |
|---|---|
| 214 11:c13eb81022ca f (no-eol) | 214 11:c13eb81022ca f (no-eol) |
| 215 $ hg histedit -r '.' --commands - <<EOF | 215 $ hg histedit -r '.' --commands - <<EOF |
| 216 > edit b346ab9a313d 6 c | 216 > edit b346ab9a313d 6 c |
| 217 > EOF | 217 > EOF |
| 218 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 218 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 219 adding c | |
| 220 Editing (b346ab9a313d), you may commit or record as needed now. | 219 Editing (b346ab9a313d), you may commit or record as needed now. |
| 221 (hg histedit --continue to resume) | 220 (hg histedit --continue to resume) |
| 222 [1] | 221 [1] |
| 223 $ echo c >> c | 222 $ echo c >> c |
| 224 $ hg histedit --continue | 223 $ hg histedit --continue |
| 349 > pick b605fb7503f2 14 i | 348 > pick b605fb7503f2 14 i |
| 350 > pick 3a6c53ee7f3d 15 j | 349 > pick 3a6c53ee7f3d 15 j |
| 351 > pick ee118ab9fa44 16 k | 350 > pick ee118ab9fa44 16 k |
| 352 > EOF | 351 > EOF |
| 353 0 files updated, 0 files merged, 6 files removed, 0 files unresolved | 352 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
| 354 adding f | |
| 355 Editing (b449568bf7fc), you may commit or record as needed now. | 353 Editing (b449568bf7fc), you may commit or record as needed now. |
| 356 (hg histedit --continue to resume) | 354 (hg histedit --continue to resume) |
| 357 [1] | 355 [1] |
| 358 $ echo f >> f | 356 $ echo f >> f |
| 359 $ hg histedit --continue | 357 $ hg histedit --continue |
| 392 > pick b605fb7503f2 14 i | 390 > pick b605fb7503f2 14 i |
| 393 > pick 3a6c53ee7f3d 15 j | 391 > pick 3a6c53ee7f3d 15 j |
| 394 > pick ee118ab9fa44 16 k | 392 > pick ee118ab9fa44 16 k |
| 395 > EOF | 393 > EOF |
| 396 0 files updated, 0 files merged, 6 files removed, 0 files unresolved | 394 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
| 397 adding f | |
| 398 Editing (b449568bf7fc), you may commit or record as needed now. | 395 Editing (b449568bf7fc), you may commit or record as needed now. |
| 399 (hg histedit --continue to resume) | 396 (hg histedit --continue to resume) |
| 400 [1] | 397 [1] |
| 401 $ echo f >> f | 398 $ echo f >> f |
| 402 $ hg histedit --continue | 399 $ hg histedit --continue |