##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: disallow merge abort in case of an unfinished operation (issue6160)...
merge: disallow merge abort in case of an unfinished operation (issue6160) This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so as to avoid partial abort of these operations in case merge abort is called at an interrupted step. The patch adds a `cmdutil.getunfinishedstate` function which checks for operations under progress and returns a `statecheck` object for it. Differential Revision: https://phab.mercurial-scm.org/D6607
Mathias De Mare - - Load All Authors

File last commit:

r41270:4c0d4bbd default
r42780:b8d54f46 default
Show More
centos5
27 lines | 609 B | text/plain | TextLexer
/ contrib / packaging / docker / centos5
History | Annotation | Raw |Copy content |Copy permalink
FROM centos:centos5
RUN groupadd -g %GID% build && \
useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
RUN \
sed -i 's/^mirrorlist/#mirrorlist/' /etc/yum.repos.d/*.repo && \
sed -i 's/^#\(baseurl=\)http:\/\/mirror.centos.org\/centos/\1http:\/\/vault.centos.org/' /etc/yum.repos.d/*.repo && \
sed -i 's/\$releasever/5.11/' /etc/yum.repos.d/*.repo
RUN yum install -y \
gcc \
gettext \
make \
python-devel \
python-docutils \
rpm-build \
tar
# For creating repo meta data
RUN yum install -y \
bzip2-devel \
createrepo \
ncurses-devel \
openssl-devel \
readline-devel \
zlib-devel