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

revert: properly revert to ancestor of p2 during merge (issue5052)...

revert: properly revert to ancestor of p2 during merge (issue5052) During merge, added (from one perspective) file can be reported as "modified". To work around that, revert was testing if modified file were present in the parent manifest and marking them as "added" in this case. However, we should be checking against the target revision manifest instead. Otherwise see file as "newly added" even if they exist in the target revision. That revert behavior regressed in 06fbd9518bc5.

Mads Kiilerich - - Load All Authors

File last commit:

r23033:1d354814 default


                r28192:cb6a952e

stable

Download file

             centos7
        
                    9 lines
            
             | 254 B
            
                | text/plain
            
             |
                TextLexer

/ contrib / docker / centos7

History | Annotation | Raw |Copy content |Copy permalink

				FROM centos:centos7
				RUN yum install -y gcc
				RUN yum install -y python-devel python-docutils
				RUN yum install -y make
				RUN yum install -y rpm-build
				RUN yum install -y gettext
				RUN yum install -y tar
				# For creating repo meta data
				RUN yum install -y createrepo

	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