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

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

mergestate: don't pop stateextras when there are no conflicts on filemerge...
mergestate: don't pop stateextras when there are no conflicts on filemerge Even if `filemerge.filemerge()` didn't result in conflicts, we should not remove stateextras for a file since we now use that for more things than just merge time information. We use stateextras to store information which is required to be used by commit. I tracked this down while finding why a patch of mine which adds more commit related information does not work as expected and looses the extras in mergestate. Differential Revision: https://phab.mercurial-scm.org/D10148
Matt Harbison - - Load All Authors

File last commit:

r47036:e74274fc default
r47539:1099ca17 default
Show More
requirements-windows.txt.in
11 lines | 316 B | text/plain | TextLexer
/ contrib / packaging / requirements-windows.txt.in
History | Annotation | Raw |Copy content |Copy permalink
docutils
# Pinned to an old version because 0.20 drops Python 3 compatibility.
dulwich < 0.20 ; python_version <= '2.7'
dulwich ; python_version >= '3'
keyring
pygit2 ; python_version >= '3'
pygments
# Need to list explicitly so dependency gets pulled in when
# not running on Windows.
pywin32-ctypes
windows-curses