From patchwork Fri Oct 10 16:08:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: test-merge5: remove obsolete '-y' and its motivating comment From: Martin von Zweigbergk X-Patchwork-Id: 6180 Message-Id: To: mercurial-devel@selenic.com Date: Fri, 10 Oct 2014 09:08:52 -0700 # HG changeset patch # User Martin von Zweigbergk # Date 1412899065 25200 # Thu Oct 09 16:57:45 2014 -0700 # Node ID cc401026e86832e14bb50e2faed388aba670d7d7 # Parent a1eb21f5caea4366310e32aa85248791d5bbfa0c 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. diff --git a/tests/test-merge5.t b/tests/test-merge5.t --- a/tests/test-merge5.t +++ b/tests/test-merge5.t @@ -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