Mercurial > hg
view contrib/docker/centos5 @ 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 | eea2e0f76a24 |
children | aa7a3f6e3729 |
line wrap: on
line source
FROM centos:centos5 RUN yum install -y gcc make rpm-build gettext tar RUN yum install -y python-devel python-docutils # For creating repo meta data RUN yum install -y createrepo RUN yum install -y readline-devel openssl-devel ncurses-devel zlib-devel bzip2-devel