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

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

split: close transaction in the unlikely event of a conflict while rebasing...
split: close transaction in the unlikely event of a conflict while rebasing `hg split` *should* never result in conflicts, but in case there are bugs, we should at least commit the transaction so they can continue the rebase. One of our users ran into the regression fixed by D10120. They fixed the conflict and the tried to continue the rebase, but it failed with "abort: cannot continue inconsistent rebase" because the rebase state referred to commits written in a transaction that was never committed. Side note: `hg split` should probably turn off copy tracing to reduce the impact of such bugs, and to speed it up as well. Copies made in the rebased commits should still be respected because `hg rebase` calls `copies.graftcopies()`. Differential Revision: https://phab.mercurial-scm.org/D10164
Gregory Szorc - - Load All Authors

File last commit:

r46284:9934920a default
r47492:7f6c002d default
Show More
linux-requirements.txt.in
17 lines | 622 B | text/plain | TextLexer
/ contrib / automation / linux-requirements.txt.in
History | Annotation | Raw |Copy content |Copy permalink
# black pulls in typed-ast, which doesn't install on PyPy.
black==19.10b0 ; python_version >= '3.6' and platform_python_implementation != 'PyPy'
# Bazaar doesn't work with Python 3 nor PyPy.
bzr ; python_version <= '2.7' and platform_python_implementation == 'CPython'
docutils
fuzzywuzzy
# isort 5.0 drops support for Python 3.5. We can remove this line when we
# drop support for 3.5.
isort < 5.0
pyflakes
pygments
pylint
# Needed to avoid warnings from fuzzywuzzy.
python-Levenshtein
# typed-ast dependency doesn't install on PyPy.
typed-ast ; python_version >= '3.0' and platform_python_implementation != 'PyPy'
vcrpy