Mercurial > hg
view contrib/vagrant/Vagrantfile @ 31174:842489d18118
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 | a31ffc445f02 |
children | 7fd16ddabaa0 |
line wrap: on
line source
# -*- mode: ruby -*- Vagrant.configure('2') do |config| # Debian 8.1 x86_64 without configuration management software config.vm.box = "debian/jessie64" config.vm.hostname = "tests" config.vm.define "tests" do |conf| conf.vm.provision :file, source: "run-tests.sh", destination:"run-tests.sh" conf.vm.provision :shell, path: "provision.sh" conf.vm.synced_folder "../..", "/hgshared" end end