Mercurial > hg
comparison tests/test-shelve.t @ 42566:f802a75da585
patch: use a short, fixed-size message for last line of prompt (issue6158)
See issue6158 and the previous commit for examples of what might go wrong if we
have some combinations of readline version and terminal and need to wrap the
line.
Briefly: readline may not display the beginning of the last line of the prompt,
or it may print over it with the end of the prompt, making it difficult for
users to know what's going on.
Differential Revision: https://phab.mercurial-scm.org/D6563
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Thu, 20 Jun 2019 14:45:52 -0700 |
parents | 3de4f17f4824 |
children | 5162753c4c14 |
comparison
equal
deleted
inserted
replaced
42565:4764e8436b2a | 42566:f802a75da585 |
---|---|
754 > y | 754 > y |
755 > n | 755 > n |
756 > EOF | 756 > EOF |
757 diff --git a/a/a b/a/a | 757 diff --git a/a/a b/a/a |
758 2 hunks, 2 lines changed | 758 2 hunks, 2 lines changed |
759 examine changes to 'a/a'? [Ynesfdaq?] y | 759 examine changes to 'a/a'? |
760 (enter ? for help) [Ynesfdaq?] y | |
760 | 761 |
761 @@ -1,3 +1,4 @@ | 762 @@ -1,3 +1,4 @@ |
762 +a | 763 +a |
763 a | 764 a |
764 c | 765 c |
765 x | 766 x |
766 record change 1/2 to 'a/a'? [Ynesfdaq?] y | 767 record change 1/2 to 'a/a'? |
768 (enter ? for help) [Ynesfdaq?] y | |
767 | 769 |
768 @@ -1,3 +2,4 @@ | 770 @@ -1,3 +2,4 @@ |
769 a | 771 a |
770 c | 772 c |
771 x | 773 x |
772 +x | 774 +x |
773 record change 2/2 to 'a/a'? [Ynesfdaq?] n | 775 record change 2/2 to 'a/a'? |
776 (enter ? for help) [Ynesfdaq?] n | |
774 | 777 |
775 shelved as test | 778 shelved as test |
776 merging a/a | 779 merging a/a |
777 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 780 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
778 $ cat a/a | 781 $ cat a/a |