Skip to content
Snippets Groups Projects
Commit 842489d1 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

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.
parent 052e4f1f
No related merge requests found
......@@ -288,5 +288,5 @@
Locally removed file is allowed
$ hg up -qC 3
$ hg rm a
$ hg rm foo
$ hg up -q 4
......@@ -292,7 +292,4 @@
$ hg up -q 4
abort: uncommitted changes
(commit or update --merge to allow merge)
[255]
File conflict is not allowed
$ hg up -qC 3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment