This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: Setup non-pushing gerrit instance for glibc.

From: Jonathan Nieder <jrnieder at gmail dot com>
To: Florian Weimer <fw at deneb dot enyo dot de>
Cc: Carlos O'Donell <carlos at redhat dot com>, "Gabriel F. T. Gomes" <gabriel at inconstante dot net dot br>, libc-alpha <libc-alpha at sourceware dot org>, Sergio Durigan Junior <sergiodj at redhat dot com>
Date: Tue, 12 Nov 2019 12:02:18 -0800
Subject: Re: Setup non-pushing gerrit instance for glibc.
References: <2e93ece9-386b-c587-9355-33a4695a3f02@redhat.com> <20191112155303.2215a667@tereshkova.br.ibm.com> <1f1bbb12-4121-7243-35f7-dd082fc1c4fd@redhat.com> <877e44g925.fsf@mid.deneb.enyo.de>

Florian Weimer wrote:

> Gerrit's notion of a rebases and conflicts is a bit unclear to me.  I
> think it doesn't run the real Git behind the scenes, so it can't know
> what kind of conflicts can be resolved by automated merging.

Gerrit uses JGit, which does perform automated merging.  It is an
independent implementation from Git --- there's no guarantee that
their behavior always matches each other, but if one is worse in a
particular case then the relevant project would consider it a bug.

Thanks,
Jonathan

References:
- Re: Setup non-pushing gerrit instance for glibc.
  - From: Gabriel F. T. Gomes
- Re: Setup non-pushing gerrit instance for glibc.
  - From: Carlos O'Donell
- Re: Setup non-pushing gerrit instance for glibc.
  - From: Florian Weimer

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]