Docs Website Broken

Fri Nov 25 18:58:36 UTC 2011

> Hi:
> 
> Thank you to Steve for dealing with the unexpected problems in
> publishing the
> Musicians' Guide over the past few days. I'm glad to have the most
> recent
> version available on the website now, because some colleagues are
> interested
> in using it!
> 
> As for fixing the website, I'm curious how you reverted the changes.
> When I
> tried to run `git revert` I got an error saying the binary file
> "fedoradocs.db"
> couldn't be reverted. Then I tried to use Publican to un-publish the
> guide,
> and that also didn't work. Maybe this could/should be added to the
> wiki?

Upon realising my mistake what I believe I did is:

1) Performed a `git pull` and then looked at `git log` to find the IDs of my commits (and also to check if anyone else had made commits in the meantime - nobody did but in the end I decided to use specific commit IDs when reverting anyway).

commit 8e00301a0c7c9825d314d70cc16ca7b0ae874d12
Author: Stephen Gordon <stephen.a.gordon at gmail.com>
Date:   Thu Nov 24 17:06:31 2011 -0500

    Worked around Author_Group issue in Musician's Guide to supply PDF version.

commit 71128b6bd8fadde9c4443015b7a4f7cb1d1b8f11
Author: Stephen Gordon <stephen.a.gordon at gmail.com>
Date:   Thu Nov 24 16:17:54 2011 -0500

    Added Musician's Guide for F16 - No PDF at this time due to FOP issues.

commit 101de22af4ab426ff797b0ce01f0fd4192e65461
Author: Tadashi Jokagi <elf at elf.no-ip.org>
Date:   Wed Nov 23 16:20:26 2011 +0900

    * updated Fedora_Live_Images for f16. (ja-JP)

2) Peeled them back using `git revert`:

git revert 8e00301a0c7c9825d314d70cc16ca7b0ae874d12
git revert 71128b6bd8fadde9c4443015b7a4f7cb1d1b8f11

3) Used `git diff 101de22af4ab426ff797b0ce01f0fd4192e65461` to check that my working copy was now identical to the previous 'known good' commit. 

4) At this point I performed the `git commit` and `git push`, I did consider doing a rebase to squash the two commits together but decided that for whoever came along after me it would be clearer if there was a 1 to 1 mapping between my initial (bad) commits and the ones undoing them.

I didn't get the error you pasted relating to the database file, I'm not sure why this would be especially since we would have been working against the same version of the web.git repo. As per my other email I have since been on a bit of a voyage of discovery and worked out what I had done wrong. With that information in hand the Musicians Guide has now been published for Fedora 16 :).

-Steve

> Regards,
> Christopher.
> 
> On 25 November 2011 07:00:08 docs-request at lists.fedoraproject.org
> wrote:
> > Message: 4
> > Date: Thu, 24 Nov 2011 23:57:02 -0500 (EST)
> > From: Steve Gordon <sgordon at redhat.com>
> > Subject: Re: Docs Website Broken
> > To: For participants of the Documentation Project
> >         <docs at lists.fedoraproject.org>
> > Message-ID:
> >         <507770e0-9d39-4b12-8134-86ce71918898 at zmail15.collab.prod.int.phx2.
> > redhat.com>
> > Content-Type: text/plain; charset=utf-8
> > 
> > > -----BEGIN PGP SIGNED MESSAGE-----
> > > Hash: SHA1
> > >
> > > 
> > >
> > > Greetings, List:
> > > 
> > >
> > > Some recent changes to the Docs website seem to have broken it.
> > > The
> > > menu lists
> > > all docs as "Untranslated" for English, except the Musicians'
> > > Guide.
> > > And there
> > > are two "English" selections in the language-selection menu.
> > >
> > > 
> > >
> > > I tried to reverse the changes myself, but it doesn't seem to be
> > > working.
> > >
> > > 
> > > 
> > >
> > > Christopher.
> > 
> > Hi all,
> > 
> > Just looking at this now I can see that this was caused by my
> > earlier
> > commit. I am in the process of rolling this back now (via 2 fresh
> > commits,
> > 1 to revert each set of changes) to get back to the previous state
> > (commit
> > 101de22af4ab426ff797b0ce01f0fd4192e65461), apologies for the
> > trouble.
> > 
> > I will investigate further into why these changes occurred in my
> > commit in
> > the morning. It's obvious from the diffs why this has broken the
> > site, but
> > I can't see how my copy ended up in this state from a fresh
> > checkout of
> > web.git and the instructions I followed
> > (http://fedoraproject.org/wiki/Publishing_a_document_with_Publican).
> > 
> > -Steve
> > 
> > > -----BEGIN PGP SIGNATURE-----
> > > Version: GnuPG v2.0.18 (GNU/Linux)
> > >
> > > 
> > >
> > > iQEcBAEBAgAGBQJOzwexAAoJEInCktGVqZ8Vl5oH/3MXti+InSfNc7m/6om37mi8
> > > aV5ufWOO5j1Zi56wPcaER0Mk73u3JWZBvi1S/A8N+ISWpjehs62cgfNHXljTSBu2
> > > scbVxzJLmcTZ5MLd6Pn4iqKHlGZd1XSmiYO+0IEpef1UoRLHJacalyIXHdCql3ev
> > > VXrGAWhihj/YywkC+vJm/kCdkUHlj3e48jNEPAGQyufkuuVv8uG4Vau3KCosndDZ
> > > 1fDGmaiasdyYwo41I251FAyNo+cG4/X5ce6r2utIfuZJiT/KX2UrlkDaK11X0nS+
> > > 8CIjoxPWzx0R5jNQun7NfOUEqlg24UtIoxPCJd4CFWW6+JBkQVb8wrbnCItiv2A=
> > > =vFTP
> > > -----END PGP SIGNATURE-----
> > > --
> > > docs mailing list
> > > docs at lists.fedoraproject.org
> > > To unsubscribe:
> > > https://admin.fedoraproject.org/mailman/listinfo/docs
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2.0.18 (GNU/Linux)
> 
> iQEcBAEBAgAGBQJOz95VAAoJEInCktGVqZ8VqawH/0SYFS61Y/bUngoXqvCuWa0A
> G7vgZLS64p47efGQ7JIW8GDT4uDD9IK/4DVvk/SIV86hRWmtbD0ePHN0LYmvMWeZ
> DmvuyZ5+6P6yFRXUEwP/DhaStMj2i9KFEngY94xoYdIJTG23mlGzH7LWCJUY1biM
> vywwSCnr7wu3D+S7TRcc7anowKahpECGcbFvy4ky5Poj4d9ZvkVauxpOLIZFoKsz
> w/SSkbjlC9E294ACrPsizArvyOKC3xSCfnNcJGqYlkHzyw5RET53HupQoRr/KAzH
> anB+0PZTNg8Cm44JileIBbxWXICq62lDntOCxzW5HtE9c9HySuNrEt+CyeZqxjs=
> =b/RX
> -----END PGP SIGNATURE-----
> --
> docs mailing list
> docs at lists.fedoraproject.org
> To unsubscribe:
> https://admin.fedoraproject.org/mailman/listinfo/docs