From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_GMAIL_RCVD, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 192991F4B5 for ; Tue, 12 Nov 2019 20:02:26 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:message-id:references :mime-version:content-type:in-reply-to; q=dns; s=default; b=xS9e DC2WZDrKSKoueFgnPh2ZLq3cg/PHaOusUT4MRbZ6O+dW61A6UPUJu9gTJNoRcRs9 NqECDx87dI0VHvwwK6NvgZUmcOz0iasTKvAya1UlGAU68l5+L0/MvftO9lfnShlZ 1cOsUs+us5LjEqD4cg8xR0CV8l+ba+VqJ7FmqdU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:message-id:references :mime-version:content-type:in-reply-to; s=default; bh=vmmLvVVztK wu58ErDTeIl3z6mm4=; b=VlR61NTRckgJhkiDL0YLVqG5ZYc4KvpcFiXnfinmp/ WDD7XkJp2dwo6PCAFjfoEYhFTLRxLEd3MSv+IVkhI7PlfnIAdsAoxtGMg52OEGz/ fcfhYSDVCkPD22BdjJdW5idSnBZbkRIVObtymo0TBre7TUcXBRMeQCY7Q4E7I34p 4= Received: (qmail 102644 invoked by alias); 12 Nov 2019 20:02:24 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 102636 invoked by uid 89); 12 Nov 2019 20:02:23 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mail-pl1-f178.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=77OVodLIkqRtv4SCY7ROeJRoeqUvy2PKVryttMjM+ig=; b=rgSzCDa45IumZ5EYswf3MV0OFBd3Rokzq2M1iVTDzUzTzbB14EoYAsxW+TSHUIxl2b rVBeOTHOvSgFZ+tZyN+ZP/yI6EqOUr3vOcAh1E8BBQYCKgrwNF8KzfMt9G4H1cpPEwIi bOs6g1WyMiZSmI8W4KtsbKOhFuHtpJA/Fqb1x8ytDPD3psxcMt+2/ExQjNcduNbaM1bY TteN3bhKP5pLHy2nheD/MNHK/9fn8x0pPwj2HybRKV+H3gtU4EH9ZNHiTgwcXQ2uqTt+ +CIQqsZ2JHwHu+6n5mz2IjJdVIreZNqn2kd3tmBQT5GMb/D9ks01e4Y6fwOpAkPgLzeF 7UPQ== Date: Tue, 12 Nov 2019 12:02:18 -0800 From: Jonathan Nieder To: Florian Weimer Cc: Carlos O'Donell , "Gabriel F. T. Gomes" , libc-alpha , Sergio Durigan Junior Subject: Re: Setup non-pushing gerrit instance for glibc. Message-ID: <20191112200218.GB25693@google.com> 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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <877e44g925.fsf@mid.deneb.enyo.de> User-Agent: Mutt/1.10.1 (2018-07-13) 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