upstream/mercurial-mirror Files · contrib/packaging/docker/centos7

merge: consider the file merged when using :merge-{local,other}...

merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999

Mathias De Mare - - Load All Authors

File last commit:

r48266:25d36300 stable


                r49415:50de0890

default

Download file

             centos7
        
                    20 lines
            
             | 361 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
Mathias De Mare packaging: switch centos 7 packaging to python 3...	r46440	RUN yum install -y epel-release
Gregory Szorc packaging: move most of contrib/docker to contrib/packaging/docker...	r38023	RUN yum install -y \
		gcc \
		gettext \
		make \
Mathias De Mare packaging: switch centos 7 packaging to python 3...	r46440	python3-devel \
		python36-docutils \
Gregory Szorc packaging: move most of contrib/docker to contrib/packaging/docker...	r38023	rpm-build \
		tar

		# For creating repo meta data
		RUN yum install -y createrepo
Mathias De Mare Backed out changeset 9b8f326731ac...	r48266
		# For rust extensions
		RUN yum install -y cargo

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages