Mercurial > hg
changeset 23026:fe80fdf68ba7
test-merge5: remove obsolete '-y' and its motivating comment
The '-y' in 'hg update -y' was once needed to answer questions about
modify/delete conflicts. That is no longer needed, so remove the '-y'
and the comment justifying its use.
| author | Martin von Zweigbergk <martinvonz@gmail.com> |
|---|---|
| date | Thu, 09 Oct 2014 16:57:45 -0700 |
| parents | b8dd8432395d |
| children | 3971f64d7a25 |
| files | tests/test-merge5.t |
| diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge5.t Fri Oct 17 11:01:05 2014 -0400 +++ b/tests/test-merge5.t Thu Oct 09 16:57:45 2014 -0700 @@ -26,13 +26,9 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mv a c -In theory, we shouldn't need the "-y" below, but it prevents this test -from hanging when "hg update" erroneously prompts the user for "keep -or delete". - Should abort: - $ hg update -y 1 + $ hg update 1 abort: uncommitted changes (commit or update --clean to discard changes) [255] @@ -40,5 +36,5 @@ Should succeed: - $ hg update -y 1 + $ hg update 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved