Mercurial > hg
view contrib/docker/centos6 @ 35410:83014fa95435
rebase: fix for hgsubversion
5c25fe7fb1e broke something in the hgsubversion test path, causing it raise an
abort (Abort: nothing to merge) during a perfectly good rebase. I tracked it
down to this change. It's probably not hgsubversion related.
I suspect that using the same `wctx` from before the initial update causes
problems with the wctx's cached manifest property. I noticed we also sometimes
stick random gunk on the wctx object in other places (like in `copies.py`) so
it's probably best to reset it for now.
The line I added before was actually useless since we don't pass wctx to the
initial `merge.update`, so it defaults to `repo[None]`. So I just removed it.
Differential Revision: https://phab.mercurial-scm.org/D1679
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Tue, 12 Dec 2017 22:05:21 -0800 |
parents | 1baa077214ae |
children |
line wrap: on
line source
FROM centos:centos6 RUN yum install -y \ gcc \ gettext \ make \ python-devel \ python-docutils \ rpm-build \ tar # For creating repo meta data RUN yum install -y createrepo # For python RUN yum install -y \ bzip2-devel \ ncurses-devel \ openssl-devel \ readline-devel \ zlib-devel