Patchwork [1,of,2] tests: fix test-update-branches to remove non-conflicting file

login
register
mail settings
Submitter via Mercurial-devel
Date March 7, 2017, 7:50 a.m.
Message ID <76aa7c5b624792a316c6.1488873037@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/18952/
State Accepted
Headers show

Comments

via Mercurial-devel - March 7, 2017, 7:50 a.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1488871197 28800
#      Mon Mar 06 23:19:57 2017 -0800
# Node ID 76aa7c5b624792a316c6e028b77a59aee95e5a3b
# Parent  052e4f1ffce964ffae6333aec4883ef2b4080e4f
tests: fix test-update-branches to remove non-conflicting file

I was clearly very sloppy when I wrote the test case for
experimental.updatecheck=noconflict. The test case that checks that
one can move between commits with a removed file was deleting a file
that was modified between the source and target commits, which
resulted in a "change/delete" conflict. Since that is a conlict, the
update correctly failed. Let's fix the test by removing a file that is
not modified between the two commits.

Patch

diff -r 052e4f1ffce9 -r 76aa7c5b6247 tests/test-update-branches.t
--- a/tests/test-update-branches.t	Sat Feb 25 17:08:42 2017 +0900
+++ b/tests/test-update-branches.t	Mon Mar 06 23:19:57 2017 -0800
@@ -288,11 +288,8 @@ 
 
 Locally removed file is allowed
   $ hg up -qC 3
-  $ hg rm a
+  $ hg rm foo
   $ hg up -q 4
-  abort: uncommitted changes
-  (commit or update --merge to allow merge)
-  [255]
 
 File conflict is not allowed
   $ hg up -qC 3