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

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

amend: stop specifying matcher, get all copies in wctx...
amend: stop specifying matcher, get all copies in wctx When we're recreating the commit that we'll be committing, we don't want to filter our copy information based on just the *new* [versions of the] files we're amending. The test has an example of this case, but for clarity, the situation is: ``` $ hg cp src dst && hg commit <do some work> $ hg amend some_unrelated_file.txt $ hg status --copies A dst A some_unrelated_file.txt ``` What *should* happen is that `dst` should remain marked as a copy of `src`, but this did not previously happen. `matcher` here only includes the files that were specified on the commandline, so it only gets the copy information (if any, in this example there's not) for `some_unrelated_file.txt`. When it goes to apply the memctx to actually create the commit, the file copy information is incomplete and loses the information for the files that shouldn't have been affected at all by the amend. Differential Revision: https://phab.mercurial-scm.org/D12625
Matt Harbison - - Load All Authors

File last commit:

r46582:97142451 default
r50074:df68d64b stable
Show More
ubuntu.template
21 lines | 365 B | text/plain | TextLexer
/ contrib / packaging / docker / ubuntu.template
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
packaging: don't write files for templatized Dockerfiles...
 r38477 FROM ubuntu:%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
Matt Harbison
packaging: drop Disco (19.04) and add Focal (20.04)...
 r46582 ARG DEBIAN_FRONTEND=noninteractive
ENV TZ=%TZ%
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 \
Connor Sheehan
packaging: update Ubuntu docker build dependencies to Python 3...
 r44488 python3-all \
python3-all-dev \
python3-docutils \
Gregory Szorc
packaging: move most of contrib/docker to contrib/packaging/docker...
 r38023 unzip \
zip