Mercurial > hg

changeset 31174:842489d18118

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 06 Mar 2017 23:19:57 -0800
parents 052e4f1ffce9
children 7433b3bc55ee
files tests/test-update-branches.t
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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