##// 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
Augie Fackler - - Load All Authors

File last commit:

r40621:d0a6b2c8 default
r42780:b8d54f46 default
Show More
fedora29
15 lines | 263 B | text/plain | TextLexer
/ contrib / packaging / docker / fedora29
History | Annotation | Raw |Copy content |Copy permalink
FROM fedora:29
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN dnf install -y \
gcc \
gettext \
make \
python-devel \
python-docutils \
rpm-build
# For creating repo meta data
RUN dnf install -y createrepo