Mercurial > evolve
comparison tests/test-uncommit-interactive.t @ 5315:0f2ef115f908 mercurial-4.9
test-compat: merge mercurial-5.0 into mercurial-4.9
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 08 May 2020 20:36:31 +0800 |
| parents | 7f856606d5a9 e6e92835d42d |
| children | 785b5be835ee |
comparison
equal
deleted
inserted
replaced
| 5314:e6e92835d42d | 5315:0f2ef115f908 |
|---|---|
| 786 h | 786 h |
| 787 +i | 787 +i |
| 788 | 788 |
| 789 $ hg uncommit -i a << DONE | 789 $ hg uncommit -i a << DONE |
| 790 > y | 790 > y |
| 791 > y | |
| 791 > DONE | 792 > DONE |
| 792 diff --git a/a b/a | 793 diff --git a/a b/a |
| 793 1 hunks, 1 lines changed | 794 1 hunks, 1 lines changed |
| 795 examine changes to 'a'? [Ynesfdaq?] y | |
| 796 | |
| 794 @@ -9,3 +9,4 @@ | 797 @@ -9,3 +9,4 @@ |
| 795 4 | 798 4 |
| 796 5 | 799 5 |
| 797 babar | 800 babar |
| 798 +celeste | 801 +celeste |
| 849 | 852 |
| 850 Same but do not select some change in 'a' | 853 Same but do not select some change in 'a' |
| 851 | 854 |
| 852 $ hg uncommit -i a << DONE | 855 $ hg uncommit -i a << DONE |
| 853 > y | 856 > y |
| 857 > y | |
| 854 > n | 858 > n |
| 855 > DONE | 859 > DONE |
| 856 diff --git a/a b/a | 860 diff --git a/a b/a |
| 857 2 hunks, 2 lines changed | 861 2 hunks, 2 lines changed |
| 862 examine changes to 'a'? [Ynesfdaq?] y | |
| 863 | |
| 858 @@ -1,3 +1,4 @@ | 864 @@ -1,3 +1,4 @@ |
| 859 +-3 | 865 +-3 |
| 860 -2 | 866 -2 |
| 861 -1 | 867 -1 |
| 862 0 | 868 0 |