Re: [eigen] GitLab migration is starting now!

[Christoph Hertzberg <chtz@xxxxxxxxxxxxxxxxxxxxxxxx>]

On 06/12/2019 16.20, Gael Guennebaud wrote:
> On Fri, Dec 6, 2019 at 3:56 PM Christoph Hertzberg <
> chtz@xxxxxxxxxxxxxxxxxxxxxxxx> wrote:
>
> > Great!
> > I guess we could revoke reporter access from those who got that? Or is
> > there any benefit having that now? (And we could disable requesting
> > access -- the few people who had write access and still need it, can
> > write to the core-list).
>
> agree.

Done. If anyone thinks they need more than guest access, please contact 
us (and briefly explain why).


> > Also, any opinion on FastForward-Merge vs Merge vs semi-linear-Merge?
> >     --> Setting/General/Merge Requests/Merge Method
> >
> > FF-Merges could actually introduce non-working commits to the main
> > branch (if they are not tested individually or squashed to a single
> > commit). So I'm actually slightly tending towards the semi-linear
> > history approach.
>
> Ideally I'd like to be able to choose for each MR. FF for simple fixes,
> merge for a new large feature with its own history. Since the former are
> much more frequent that the later, I'm leaning toward FF by default. I'm
> not sure what the semi-linear-Merge really does in practice.

I agree, for "fixed typo"-style PRs, the merge commit adds more noise 
than value. It seems there is no "choose per MR" option, unfortunately 
(sure, we could change the setting, merge, and reset the setting ...)

So lets keep it at FF for now.

As far as I understand the semi-linear merge would do instead of (with 
"standard merge"):

 *_    merge PR
 | O   commit 2 of PR
 *_ \  merge other PR
 O | | commit on master
 |_O | commit in other PR
 O  /  another fork
 |_O   commit 1 of PR
 O     ancestor where PR was forked
 |     ...

Do this:

 *_    merge PR (if FF is possible)
 | O   commit 2 of PR
 |_O   commit 1 of PR
 *_    merge other PR
 |_O   commit in other PR
 O     commit on master
 O     another fork
 O     ancestor where PR was forked (originally)
 |     ...


With the current setting, we get a flat history.


Christoph



> gael
>
>
> > Cheers,
> > Christoph
> >
> >
> >
> >
> >
> > On 05/12/2019 22.25, Gael Guennebaud wrote:
> > > On Thu, Dec 5, 2019 at 6:22 PM Martin Pecka <peci.jh@xxxxxxxxx> wrote:
> > >
> > > > There has to be a better way to configure this. A random project like
> > > > https://gitlab.com/EDN2019/componentes/merge_requests allows me to see
> > > > the MRs although I'm not a member.
> > >
> > > Indeed. Now everyone can submit MR, just like everyone was already
> > allowed
> > > to submit bugs.
> > >
> > > gael
> >
> > --
> >    Dr.-Ing. Christoph Hertzberg
> >
> >    Besuchsadresse der Nebengeschäftsstelle:
> >    DFKI GmbH
> >    Robotics Innovation Center
> >    Robert-Hooke-Straße 5
> >    28359 Bremen, Germany
> >
> >    Postadresse der Hauptgeschäftsstelle Standort Bremen:
> >    DFKI GmbH
> >    Robotics Innovation Center
> >    Robert-Hooke-Straße 1
> >    28359 Bremen, Germany
> >
> >    Tel.:     +49 421 178 45-4021
> >    Zentrale: +49 421 178 45-0
> >    E-Mail:   christoph.hertzberg@xxxxxxx
> >
> >    Weitere Informationen: http://www.dfki.de/robotik
> >     -------------------------------------------------------------
> >     Deutsches Forschungszentrum für Künstliche Intelligenz GmbH
> >     Trippstadter Straße 122, D-67663 Kaiserslautern, Germany
> >
> >     Geschäftsführung:
> >     Prof. Dr. Antonio Krüger (Vorsitzender)
> >     Dr. Walter Olthoff
> >
> >     Vorsitzender des Aufsichtsrats:
> >     Dr. Gabriël Clemens
> >     Amtsgericht Kaiserslautern, HRB 2313
> >     -------------------------------------------------------------

--
 Dr.-Ing. Christoph Hertzberg

 Besuchsadresse der Nebengeschäftsstelle:
 DFKI GmbH
 Robotics Innovation Center
 Robert-Hooke-Straße 5
 28359 Bremen, Germany

 Postadresse der Hauptgeschäftsstelle Standort Bremen:
 DFKI GmbH
 Robotics Innovation Center
 Robert-Hooke-Straße 1
 28359 Bremen, Germany

 Tel.:     +49 421 178 45-4021
 Zentrale: +49 421 178 45-0
 E-Mail:   christoph.hertzberg@xxxxxxx

 Weitere Informationen: http://www.dfki.de/robotik
  -------------------------------------------------------------
  Deutsches Forschungszentrum für Künstliche Intelligenz GmbH
  Trippstadter Straße 122, D-67663 Kaiserslautern, Germany

  Geschäftsführung:
  Prof. Dr. Antonio Krüger (Vorsitzender)
  Dr. Walter Olthoff

  Vorsitzender des Aufsichtsrats:
  Dr. Gabriël Clemens
  Amtsgericht Kaiserslautern, HRB 2313
  -------------------------------------------------------------