##// END OF EJS Templates
rebase: in --confirm option just abort if hit a conflict...
rebase: in --confirm option just abort if hit a conflict Before this patch, it was prompting the user in both cases 1) when there is no conflict 2) when there is at least one conflict. But for simplicity we can just abort if we hit a conflict and no need to prompt in that case. Differential Revision: https://phab.mercurial-scm.org/D3944

File last commit:

r38477:c8ef9d89 default
r38701:b3d0c97a @81 default
Show More
debian.template
16 lines | 298 B | text/plain | TextLexer
Gregory Szorc
packaging: don't write files for templatized Dockerfiles...
r38477 FROM debian:%CODENAME%
Gregory Szorc
packaging: consistently create build user in Dockerfiles...
r38475
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
Gregory Szorc
packaging: move most of contrib/docker to contrib/packaging/docker...
r38023 RUN apt-get update && apt-get install -y \
build-essential \
debhelper \
devscripts \
dh-python \
less \
python \
python-all-dev \
python-docutils \
unzip \
zip