Mercurial > evolve
comparison tests/test-uncommit-interactive.t @ 4670:d0d8c0e2f3fc mercurial-4.9
test-compat: merge stable into mercurial-4.9
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 05 Jun 2019 17:38:32 +0200 |
| parents | 84512556e148 30a544904238 |
| children | 79bc0f1a832e 5ad6d92f125c |
comparison
equal
deleted
inserted
replaced
| 4662:87d60fed455a | 4670:d0d8c0e2f3fc |
|---|---|
| 778 h | 778 h |
| 779 +i | 779 +i |
| 780 | 780 |
| 781 $ hg uncommit -i a << DONE | 781 $ hg uncommit -i a << DONE |
| 782 > y | 782 > y |
| 783 > y | |
| 783 > DONE | 784 > DONE |
| 784 diff --git a/a b/a | 785 diff --git a/a b/a |
| 785 1 hunks, 1 lines changed | 786 1 hunks, 1 lines changed |
| 787 examine changes to 'a'? [Ynesfdaq?] y | |
| 788 | |
| 786 @@ -9,3 +9,4 @@ | 789 @@ -9,3 +9,4 @@ |
| 787 4 | 790 4 |
| 788 5 | 791 5 |
| 789 babar | 792 babar |
| 790 +celeste | 793 +celeste |
| 841 | 844 |
| 842 Same but do not select some change in 'a' | 845 Same but do not select some change in 'a' |
| 843 | 846 |
| 844 $ hg uncommit -i a << DONE | 847 $ hg uncommit -i a << DONE |
| 845 > y | 848 > y |
| 849 > y | |
| 846 > n | 850 > n |
| 847 > DONE | 851 > DONE |
| 848 diff --git a/a b/a | 852 diff --git a/a b/a |
| 849 2 hunks, 2 lines changed | 853 2 hunks, 2 lines changed |
| 854 examine changes to 'a'? [Ynesfdaq?] y | |
| 855 | |
| 850 @@ -1,3 +1,4 @@ | 856 @@ -1,3 +1,4 @@ |
| 851 +-3 | 857 +-3 |
| 852 -2 | 858 -2 |
| 853 -1 | 859 -1 |
| 854 0 | 860 0 |