This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: git conversion in progress
- From: Joseph Myers <joseph at codesourcery dot com>
- To: Jason Merrill <jason at redhat dot com>
- Cc: Andreas Schwab <schwab at linux-m68k dot org>, Martin Jambor <mjambor at suse dot cz>, Georg-Johann Lay <avr at gjlay dot de>, gcc Mailing List <gcc at gcc dot gnu dot org>
- Date: Tue, 14 Jan 2020 18:06:36 +0000
- Subject: Re: git conversion in progress
- Ironport-sdr: U4+HcTMUx9QJTA803clpvueXrfl9VSotVGezsh5U6OpXYKPqB8R9X0UpGuXsN3oISBlBJi9ld/ 1jsq5gAegHCNmxtABL0fqcauEVC9RwJE4wvbR0ejfFfXGCfCih7TjkfygHDJETdiKtayvD8Y4F W5XRMyhMcB88D/8aqNQf/oY9yIg0sgEs1cc0F3HtEv6NxpMwr96a7bLtxrRttvaCF4b8TIERCE 5gHY8r7sObK0Jtx+2uJRFCSG88kuF/MXko3DKnDDcJs/zXCm3mHXHXVd5+n97Cf7Ad7WgrPy9g zto=
- Ironport-sdr: L4B77ixyMgNt9/adKXwm8VhicP7898xvUj+fc0C9y/r02F8re2IwWf/85V/ZkenN22pBTHOeXY lk8F1/3kHL7Czi+ZxrA72catI3IROfdwsd7o8MfvX7QydaUdd7ItLOIO9XEPVGyjvoVOUQRWyU Ui2os3CtD+5Iav5vO7dGbRSvsB9Y7i2LdJ/2mr7fXwIRrruHM4uAAK7GKB7sQX9c+gutTKck38 rlq/pG2GRBu+c0vNGub6ecu79pAXLaGjNiqZCnESN1yr1rC8D916FLlsyAAocEXkm6kluyL+P0 4FE=
- References: <alpine.DEB.2.21.2001110102500.13991@digraph.polyomino.org.uk> <90f9f06c-b45b-ce2b-8063-258cb7509158@gjlay.de> <87y2uaxoei.fsf@igel.home> <ri6a76q9kp6.fsf@suse.cz> <87ftgixfcn.fsf@igel.home> <CADzB+2mkdZQUObz50Oyhmusn1jCqWGyhxEAidLspdnRcnw5b8Q@mail.gmail.com>
On Tue, 14 Jan 2020, Jason Merrill wrote:
> I notice that git.html on the website doesn't match what's currently in
> wwwdocs git, is automatic updating broken?
/www/gcc/wwwdocs-checkout/cgi-bin/gcc-gitref.cgi had local changes
(committed, but not reverted in that checkout before they were committed),
thereby breaking automatic updates:
error: Your local changes to the following files would be overwritten by merge:
cgi-bin/gcc-gitref.cgi
Please commit your changes or stash them before you merge.
Aborting
I've now reverted that and updated that checkout and am running
update_web_docs_git which preprocesses the whole website among other
things.
--
Joseph S. Myers
joseph@codesourcery.com