Re: Moving the documentation to git

This is only part of a thread. view whole thread
  108370
February 4, 2020 13:08 nikita.ppv@gmail.com (Nikita Popov)
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
  108385
February 4, 2020 14:20 nikita.ppv@gmail.com (Nikita Popov)
On Tue, Feb 4, 2020 at 2:08 PM Nikita Popov 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? Nikita
  108387
February 4, 2020 14:45 andreas@heigl.org (Andreas Heigl)
--5GObMUYj37i35xY75TS9UelUOwBoG3YrD
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable

Hey Nikita.

Am 04.02.20 um 15:20 schrieb Nikita Popov:
> On Tue, Feb 4, 2020 at 2:08 PM Nikita Popov ppv@gmail.com> wrot= e:
>=20 >> 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
>>> >>> 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 somew= hat
>> dated, maybe Peter has a newer one?), it would be great to preserve >> authorship in a meaningful way. >> >> Nikita >> >=20 > In a previous mail you mentioned that the current EN-Revision is now be= ing
> 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 Cheers Andreas --=20 ,,, (o o) +---------------------------------------------------------ooO-(_)-Ooo-+ | Andreas Heigl | | mailto:andreas@heigl.org N 50=C2=B022'59.5" E 08=C2=B0= 23'58" | | http://andreas.heigl.org http://hei.gl/wiFKy7 | +---------------------------------------------------------------------+ | http://hei.gl/root-ca | +---------------------------------------------------------------------+ --5GObMUYj37i35xY75TS9UelUOwBoG3YrD--
  108388
February 4, 2020 14:49 nikita.ppv@gmail.com (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 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? PS: I have done "Step 1" and created all the necessary repositories in git.php.net. Nikita
  108389
February 4, 2020 14:54 andreas@heigl.org (Andreas Heigl)
--uTyCE6pPbRT3ZNfofleuY9pLXFrZZSauz
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable

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:=
>=20 >> Hey Nikita. >> >> Am 04.02.20 um 15:20 schrieb Nikita Popov: >>> On Tue, Feb 4, 2020 at 2:08 PM Nikita Popov ppv@gmail.com> >> wrote: >>> >>>> On Tue, Feb 4, 2020 at 1:48 PM Andreas Heigl <andreas@heigl.org> wro= te:
>>>> >>>>> 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 ho= w
>>>>> they >>>>>> look like now? >>>>> >>>>> Find the repos (as they should be on git.php.net would I have acces= s)
>>>>> >>>>> They are updated after each run of the converter-tool which current= ly
>>>>> runs every two hours. >>>>> >>>> >>>> Thanks! It looks like currently the author mapping from svn -> git i= s
>>>> missing, which also means we don't get the mapping to github account= s.
>> 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 >=20 >=20 > Thanks! I think what confused me is that the last commit to the repo ( > https://github.com/phpdoctest/de/commit/10286e6f55405503cecfeae2e91fa03= 0a57a5906)
> 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?
>=20 > 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. @salathe, shall I also force-push to the neglish master-branch or shall I push to a different branch in the en-rep= o? Cheers Andreas
>=20 > Nikita >=20
--=20 ,,, (o o) +---------------------------------------------------------ooO-(_)-Ooo-+ | Andreas Heigl | | mailto:andreas@heigl.org N 50=C2=B022'59.5" E 08=C2=B0= 23'58" | | http://andreas.heigl.org http://hei.gl/wiFKy7 | +---------------------------------------------------------------------+ | http://hei.gl/root-ca | +---------------------------------------------------------------------+ --uTyCE6pPbRT3ZNfofleuY9pLXFrZZSauz--
  108391
February 4, 2020 15:04 nikita.ppv@gmail.com (Nikita Popov)
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 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