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

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

rebase: restrict rebase destination to the pulled set (issue5214)...
rebase: restrict rebase destination to the pulled set (issue5214) Before this patch, `hg pull --rebase` would be a strict sequence of `hg pull` followed by `hg rebase` if anything was pulled. Now that rebase pick his default destination the same way than merge, than `hg rebase` step would abort in the case the repo already had multiple anonymous heads (because of the ambiguity). (changed in fac3a24be50e) The intend of the user with `hg pull --rebase` is clearly to rebase on pulled content. This used to be (mostly) enforced by the former default destination for rebase, "tipmost changeset of the branch" as the tipmost would likely a changeset that just got pulled. But this intended was no longer enforced with the new defaul destination (unified with merge). This changeset makes use of the '_destspace' mechanism introduced in the previous changeset to enforce this. This partially fixes issue5214 as no change at all have been made to the new handling of the case with bookmark (unified with merge).
Mads Kiilerich - - Load All Authors

File last commit:

r23034:eea2e0f7 default
r29044:261c2537 stable
Show More
centos5
6 lines | 263 B | text/plain | TextLexer
/ contrib / docker / centos5
History | Source | Raw |Copy content |Copy permalink
Mads Kiilerich
docker: use official centos5 image...
 r23034 FROM centos:centos5
Mads Kiilerich
docker: add CentOS 5...
 r22443 RUN yum install -y gcc make rpm-build gettext tar
RUN yum install -y python-devel python-docutils
Mads Kiilerich
dockerrpm: create a yum/dnf repo from the generated rpms...
 r22444 # For creating repo meta data
RUN yum install -y createrepo
Mads Kiilerich
docker: add CentOS 5...
 r22443 RUN yum install -y readline-devel openssl-devel ncurses-devel zlib-devel bzip2-devel