Mercurial > hg
view contrib/plan9/mkfile @ 46563:c19c662097e1
copies: detect case when a merge decision overwrite previous data
We now detect and record when a merge case required special logic (eg: thing
that append during the merge, ambiguity leading to picking p1 data, etc) and we
explicitly mark the result as superseding the previous data.
This fixes the family of test we previously added.
Differential Revision: https://phab.mercurial-scm.org/D9613
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 12 Dec 2020 19:35:08 +0100 |
parents | f9262456fb01 |
children |
line wrap: on
line source
APE=/sys/src/ape <$APE/config PYTHON=python PYTHONBIN=/rc/bin SH=ape/psh PURE=--pure ROOT=../.. # This is slightly underhanded; Plan 9 does not support GNU gettext nor # does it support dynamically loaded extension modules. We work around # this by calling build_py and build_scripts directly; this avoids # additional platform hacks in setup.py. build:VQ: @{ cd $ROOT $SH -c '$PYTHON setup.py $PURE build_py build_scripts' } clean:VQ: @{ cd $ROOT $SH -c '$PYTHON setup.py $PURE clean --all' } install:VQ: build @{ cd $ROOT $SH -c '$PYTHON setup.py $PURE install \ --install-scripts $PYTHONBIN \ --skip-build \ --force' } mkdir -p /lib/mercurial/hgrc.d dircp hgrc.d /lib/mercurial/hgrc.d/ cp 9diff /rc/bin/