Broken push to the installation-guide repository

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Broken push to the installation-guide repository

Cyril Brulebois-4
Hi,

The last commit in the installation-guide repository seems quite broken
as that's a merge (using a rebase instead could have helped detect the
issue) that introduces conflict markers in the repository:

    kibi@armor:~/debian-installer/installation-guide$ git grep -E '^(=======|<<<<<<<|>>>>>>>)( |$)'
    po/el/administrivia.po:<<<<<<< HEAD
    po/el/administrivia.po:=======
    po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff
    po/el/administrivia.po:<<<<<<< HEAD
    po/el/administrivia.po:=======
    po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff
    po/el/administrivia.po:<<<<<<< HEAD
    po/el/administrivia.po:=======
    po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff
    po/el/administrivia.po:<<<<<<< HEAD
    po/el/administrivia.po:=======
    po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff

Can someone please fix that, possibly by reverting this commit entirely,
going back to what we had in the 20190622 tag?


The offending commit is:

    commit 4bb6d14fa00159bad75ef88bbcf6a84560722ab0
    Merge: dfc2cc210 b6b2c9272
    Author: root <galaxico@quteity>
    Date:   Wed Jun 26 14:55:31 2019 +0300
   
        updated Greek translations



Cheers,
--
Cyril Brulebois ([hidden email])            <https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Broken push to the installation-guide repository

Holger Wansing-4
Hi,

Cyril Brulebois <[hidden email]> wrote:

> The last commit in the installation-guide repository seems quite broken
> as that's a merge (using a rebase instead could have helped detect the
> issue) that introduces conflict markers in the repository:
>
>     kibi@armor:~/debian-installer/installation-guide$ git grep -E '^(=======|<<<<<<<|>>>>>>>)( |$)'
>     po/el/administrivia.po:<<<<<<< HEAD
>     po/el/administrivia.po:=======
>     po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff
>     po/el/administrivia.po:<<<<<<< HEAD
>     po/el/administrivia.po:=======
>     po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff
>     po/el/administrivia.po:<<<<<<< HEAD
>     po/el/administrivia.po:=======
>     po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff
>     po/el/administrivia.po:<<<<<<< HEAD
>     po/el/administrivia.po:=======
>     po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff
>
> Can someone please fix that, possibly by reverting this commit entirely,
> going back to what we had in the 20190622 tag?
>
>
> The offending commit is:
>
>     commit 4bb6d14fa00159bad75ef88bbcf6a84560722ab0
>     Merge: dfc2cc210 b6b2c9272
>     Author: root <galaxico@quteity>
>     Date:   Wed Jun 26 14:55:31 2019 +0300
>    
>         updated Greek translations

Sadly, the same happened to the d-i repository of the installer itself, too! :((

By this commit:

commit 892f02e01bc2036954a2898bf7ed72acaf99aec0
Merge: 9cf1b4ecaf 19aea1dd76
Author: root <galaxico@quteity>
Date:   Wed Jun 26 14:50:58 2019 +0300

    updated Greek translations




I fear my git knowledge is not sufficient to understand what's going on here ...


Holger


--
Holger Wansing <[hidden email]>
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076