##// 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
centos7
16 lines | 278 B | text/plain | TextLexer
/ contrib / packaging / docker / centos7
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
packaging: move most of contrib/docker to contrib/packaging/docker...
 r38023 FROM centos:centos7
Gregory Szorc
packaging: consistently create build user in Dockerfiles...
 r38475
Mathias De Mare
packaging: allow running packaging with custom uid+gid for CentOS...
 r41270 RUN groupadd -g %GID% build && \
useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
Gregory Szorc
packaging: consistently create build user in Dockerfiles...
 r38475
Gregory Szorc
packaging: move most of contrib/docker to contrib/packaging/docker...
 r38023 RUN yum install -y \
gcc \
gettext \
make \
python-devel \
python-docutils \
rpm-build \
tar
# For creating repo meta data
RUN yum install -y createrepo