Re: [PHP-DEV] Re: Moving the documentation to git

- internals (bcc'd)
+ phpdoc

On Tue, 4 Feb 2020 at 15:05, Nikita Popov <[email protected]> wrote:

> On Tue, Feb 4, 2020 at 3:55 PM Andreas Heigl <[email protected]> wrote:
>
> > Hey Nikita.
> >
> > Am 04.02.20 um 15:49 schrieb Nikita Popov:
> > > On Tue, Feb 4, 2020 at 3:46 PM Andreas Heigl <[email protected]>
> wrote:
> > >
> > >> Hey Nikita.
> > >>
> > >> Am 04.02.20 um 15:20 schrieb Nikita Popov:
> > >>> On Tue, Feb 4, 2020 at 2:08 PM Nikita Popov <[email protected]>
> > >> wrote:
> > >>>
> > >>>> On Tue, Feb 4, 2020 at 1:48 PM Andreas Heigl <[email protected]>
> > wrote:
> > >>>>
> > >>>>> Hey Nikita, hey all.
> > >>>>>
> > >>>>> Am 04.02.20 um 12:11 schrieb Nikita Popov:
> > >>>>>> On Tue, Feb 4, 2020 at 8:09 AM Andreas Heigl <[email protected]
> > >>>>>> <mailto:[email protected]>> wrote:
> > >>>>>
> > >>>>>>
> > >>>>>> Hi Andreas,
> > >>>>>>
> > >>>>>> would you mind pushing the current en/de repos to
> > >>>>>> https://github.com/phpdoctest/en and de so it's possible to see
> how
> > >>>>> they
> > >>>>>> look like now?
> > >>>>>
> > >>>>> Find the repos (as they should be on git.php.net would I have
> > access)
> > >> at
> > >>>>> https://github.com/phpdoctest/de and
> > https://github.com/phpdoctest/en
> > >>>>>
> > >>>>> They are updated after each run of the converter-tool which
> currently
> > >>>>> runs every two hours.
> > >>>>>
> > >>>>
> > >>>> Thanks! It looks like currently the author mapping from svn -> git
> is
> > >>>> missing, which also means we don't get the mapping to github
> accounts.
> > >> I'll
> > >>>> send you the author mapping file I have (which  is unfortunately
> > >> somewhat
> > >>>> dated, maybe Peter has a newer one?), it would be great to preserve
> > >>>> authorship in a meaningful way.
>

I pushed a more up-to-date authors map file to gitolite-admin. Since that's
only
helpful to a very small handful of people, here's a gist with the file:
https://gist.github.com/salathe/637fb0568a3c75bad9ceee33a7ecc983


> > >>>>
> > >>>> Nikita
> > >>>>
> > >>>
> > >>> In a previous mail you mentioned that the current EN-Revision is now
> > >> being
> > >>> tracked in a separate file. Could you point out which files that is,
> > >>> because I didn't see it in the repo. Or is it part of some other
> repo?
> > >>
> > >> The en-revision is tracked in the translated repos only, not in the
> > >> english one.
> > >>
> > >> Have a look at
> > >> https://github.com/phpdoctest/de/blob/master/.en-revisions.ref
> > >
> > >
> > > Thanks! I think what confused me is that the last commit to the repo (
> > >
> >
> https://github.com/phpdoctest/de/commit/10286e6f55405503cecfeae2e91fa030a57a5906
> > )
> > > modifies an EN-Revision in a file, but there is no corresponding update
> > to
> > > .en-revisions.ref. Shouldn't there be one?
> >
> > There should be one and I have noticed that as well. I will need to redo
> > the steps anyhow this weekend to add the correct authors-file and will
> > then also have a look at why that is not updated accordingly. Do you
> > know which file that update was in?
> >
>
> Sorry, not sure what you mean by "which file" here.
>
>
> > >
> > > PS: I have done "Step 1" and created all the necessary repositories in
> > > git.php.net.
> >
> > Awesome! Thank you! Who has commit access to that repo so far? I would
> > then start pushing the data as soon as I have fixed the authors list. At
> > least to the translations.
>
>
> I have granted you access to the new repositories (force push should also
> work -- we don't disable that by default). That is everything apart from
> doc/base, doc/en and doc/de, because Peter is currently mirroring those.
> You'll have to coordinate with him to avoid two different mirroring setups
> overwriting each other.
>

I have disabled the cronjob on the SVN box that was mirroring the doc-base,
en and de repos.
They're all yours, Andreas.


>
>
> > @salathe, shall I also force-push to the
> > neglish master-branch or shall I push to a different branch in the
> en-repo?
> >
>

As above, over to you now.  No-one should be relying on the git repos
at this point -- their status is still "experimental" -- so feel free to
rewrite the history.


>
> Once the author list is fixed, are those repositories actually going to
> differ in any way? As far as I understood, only the translation repos are
> changed. Assuming your mirroring methodology is the same, I would expect
> you to arrive at the same doc-en repo.
>
> Nikita
>