Mercurial > hg
view contrib/vagrant/provision.sh @ 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 | 8da01b6e7b49 |
children |
line wrap: on
line source
#!/bin/sh # This scripts is used to install dependencies for # testing Mercurial. Mainly used by Vagrant (see # Vagrantfile for details). export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install -y -q python-dev unzip # run-tests.sh is added by Vagrantfile chmod +x run-tests.sh