##// 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
Gregory Szorc - - Load All Authors

File last commit:

r23399:fd5247a8 default
r47539:1099ca17 default
Show More
vhost.conf
24 lines | 713 B | text/plain | TextLexer
/ contrib / docker / apache-server / vhost.conf
History | Annotation | Raw |Copy content |Copy permalink
# Apache won't be able to resolve its own hostname, so we sneak this
# into the global context to silence a confusing-to-user warning on
# server start.
ServerName hg
<VirtualHost *:80>
DocumentRoot /var/hg/htdocs
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
SetEnv HGENCODING UTF-8
SetEnv LC_TYPE UTF-8
WSGIDaemonProcess hg processes=${WSGI_PROCESSES} threads=${WSGI_THREADS} maximum-requests=${WSGI_MAX_REQUESTS} user=www-data group=www-data display-name=hg-wsgi
WSGIProcessGroup hg
WSGIScriptAliasMatch ^(.*) /var/hg/htdocs/hgweb.wsgi$1
ErrorLog ${APACHE_LOG_DIR}/error.log
LogLevel warn
CustomLog ${APACHE_LOG_DIR}/access.log combined
</VirtualHost>