##// END OF EJS Templates
rebase: clear updatestate during rebase --abort in more cases...
rebase: clear updatestate during rebase --abort in more cases Previously, rebase --abort would only call update if you were on a node that had already been rebased. This meant that if the rebase failed during the rebase of the first commit, the working copy would be left dirty (with a .hg/updatestate file) and rebase --abort would not have update to clean it up. The fix is to also perform an update if you're still on the target node or on the original working copy node (since the working copy may be dirty, we still need to do the update). We don't want to perform an update in all cases though because of issue4009. A subsequent patch makes this case much more common, since it causes the entire rebase transaction to rollback during unexpected exceptions. This causes the existing test-rebase-abort.t to cover this case.

File last commit:

r16556:f9262456 stable
r31222:56d3e0b4 default
Show More
mkfile
37 lines | 742 B | text/plain | TextLexer
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 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 \
Steven Stallion
plan9: mkfile and 9diff fixes...
r16556 --skip-build \
--force'
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 }
mkdir -p /lib/mercurial/hgrc.d
Steven Stallion
plan9: mkfile and 9diff fixes...
r16556 dircp hgrc.d /lib/mercurial/hgrc.d/
cp 9diff /rc/bin/