Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:108391
MIME-Version: 1.0
References: <8ee0dbf3-9d81-b580-0b5b-d64a23d25ad5@heigl.org>
 <CAF+90c8zcV8pZ8PK5FhDQmsjTBKnfC+scT1JjCYQSLeV9MoV=A@mail.gmail.com>
 <395f7fbc-6119-5633-86cb-ca0ef7b61dcc@heigl.org> <CAF+90c9FXXHB14cvJE4mP6iM3UQtfAkdJB9zvUr4s4gP-vYZmg@mail.gmail.com>
 <CAF+90c8uHWbo2a9L3kkWF4Ewh8r-REVdLHhzQ1Z8mTzQwGYfYw@mail.gmail.com>
 <890a809f-2c8c-671b-2448-e852075e84ac@heigl.org> <CAF+90c8zprnGb6gZSVgaSxrxO1Fo2safo_-5yTtJiDRAtkETtA@mail.gmail.com>
 <ee9713bd-4d35-3b65-9282-7926beb4727e@heigl.org>
In-Reply-To: <ee9713bd-4d35-3b65-9282-7926beb4727e@heigl.org>
Date: Tue, 4 Feb 2020 16:04:51 +0100
Message-ID: <CAF+90c9R7_A4mxbqEPyG3w65Lu5YXKUqkkaiFFEMky03QSnnpA@mail.gmail.com>
To: Andreas Heigl <andreas@heigl.org>
Cc: PHP internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary="00000000000096ac49059dc15db4"
Subject: Re: [PHP-DEV] Re: Moving the documentation to git
From: nikita.ppv@gmail.com (Nikita Popov)

--00000000000096ac49059dc15db4
Content-Type: text/plain; charset="UTF-8"

On Tue, Feb 4, 2020 at 3:55 PM Andreas Heigl <andreas@heigl.org> wrote:

> Hey Nikita.
>
> Am 04.02.20 um 15:49 schrieb Nikita Popov:
> > On Tue, Feb 4, 2020 at 3:46 PM Andreas Heigl <andreas@heigl.org> wrote:
> >
> >> Hey Nikita.
> >>
> >> Am 04.02.20 um 15:20 schrieb Nikita Popov:
> >>> On Tue, Feb 4, 2020 at 2:08 PM Nikita Popov <nikita.ppv@gmail.com>
> >> wrote:
> >>>
> >>>> On Tue, Feb 4, 2020 at 1:48 PM Andreas Heigl <andreas@heigl.org>
> 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 <andreas@heigl.org
> >>>>>> <mailto:andreas@heigl.org>> 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.
> >>>>
> >>>> 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.


> @salathe, shall I also force-push to the
> neglish master-branch or shall I push to a different branch in the en-repo?
>

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

--00000000000096ac49059dc15db4--