From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Sun, 29 Aug 2021 10:09:30 +0100 Message-ID: References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <834kb8mzk1.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="000000000000b11d1b05caaf1300" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37493"; mail-complaints-to="usenet@ciao.gmane.io" Cc: "Philip K." , Daniel Fleischer , Theodor Thornhill , emacs-devel , Stefan Monnier , Dmitry Gutov , Eli Zaretskii , Lars Ingebrigtsen To: Drew DeVault Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 11:11:13 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mKGqP-0009Xj-97 for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 11:11:13 +0200 Original-Received: from localhost ([::1]:40584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKGqO-00088Y-2f for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 05:11:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGoz-0006SQ-QT for emacs-devel@gnu.org; Sun, 29 Aug 2021 05:09:45 -0400 Original-Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:45046) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKGoy-0004nD-9o; Sun, 29 Aug 2021 05:09:45 -0400 Original-Received: by mail-pj1-x102a.google.com with SMTP id j4-20020a17090a734400b0018f6dd1ec97so7916551pjs.3; Sun, 29 Aug 2021 02:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XeXxHnE6g89cJkOHJN95k9Q21zfyrRxOSVIffex+r5g=; b=Q8VWiggqvV1zxGcw8KUrw4MjfV2rpWZUedxQgj3H3Ix6CK085gXzpOtCxKYba8BgKs CDGHrRHJs0Qk+fQsslJF9Kl2uk98sizxOGJDNNbxTIqII40Hf9e9T+SZFBmE4VMRdROR gLWvyIbyEMZp3BWM5Cso2NcfPpbGLgKg+VeLp1JfsQm8TuygVa95zFMpIvvX1GutyrQ9 dxkmJ5ki1OPWf/KqrZdPYBxnGUPmiMXkukPvDtn/M4ItbE8Met9MVpVLH//4Di4V+d0H WEgtTHYl/fifJEThCJG83yz0l4o6F00CYVX6m4lkdVZ4IVKrBZS99eqVOimDONIbhuNz 5Eog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XeXxHnE6g89cJkOHJN95k9Q21zfyrRxOSVIffex+r5g=; b=TznZFKFthNYYs70UgDmhtTR7AE6lKVf2Wb4+vwHEhidoLfdrsHLLIGKIFGlFXrcKdZ QZsoDSMBXYEKGc8l6xxll1xA3NmXLmh5DcSfvN74m0AVBdBLTFcUEO7PXBsnnzV8CL3z 9VhoGV0A2cxKEfhdY0u6Nx3LILuvDfsw3vVPyj8QLLzp9fH42m8fw8YQ0msoVzNnY6aQ andunempzFzuZd9hh1CeXPCpInZJ2USgFSIyQZ2QDDr/FqIs1pXrFeZg0fpAxzv+VIB7 /P/vYx3B12wL5lCs7z9SwNWy0ZyTNvJbXlC/eCt/q2ZDzr3/GnczHMtMVOEg60JbbkYV i0jQ== X-Gm-Message-State: AOAM533F3Eo4oQ6gF9hl9We0K6lM69blwJ31DKDgIyHZ7VJixAdAbbaw HawCkdCf3RX0fTOWMOXQLPFgtVud+90WBxEXOG2c5tL/ X-Google-Smtp-Source: ABdhPJyNvJCy5da6w5acR5p9YxoFsSnKw+ItRclY7Uo9fn4dHDcsQE+heIVY5KBwPEv6f4gLcOPpXeNo+5iDNpeADZY= X-Received: by 2002:a17:902:6f16:b0:138:a3fa:1b7 with SMTP id w22-20020a1709026f1600b00138a3fa01b7mr9203692plk.60.1630228182014; Sun, 29 Aug 2021 02:09:42 -0700 (PDT) In-Reply-To: Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=joaotavora@gmail.com; helo=mail-pj1-x102a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:273393 Archived-At: --000000000000b11d1b05caaf1300 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Aug 29, 2021, 09:23 Drew DeVault wrote: > On Sun Aug 29, 2021 at 10:21 AM CEST, Eli Zaretskii wrote: > > I no longer remember the exact details, it was something we bumped > > into during discussions when Emacs switched to Git. AFAIR, it had to > > do with working on a feature branch and frequently rebasing it onto > > the latest master (so that the feature branch doesn't diverge too > > much), then later merging from the feature branch to master. > > Hm, weird. I would like to see some reproducible evidence of this so > that a deeper investigation can be done. I've used rebase thoroughly for > many years on hundreds of projects without any such incident. > If the branch you're integrating via rebase happens to have merge commits of its own, and you don't pass and/or fully understand what --preserve-merges does, it's possible I think. If you always always merge, it doesn't happen. Neither does it if you always always rebase, I guess. So I guess the argument can be spun around into a counter-merge argument, I guess. Anyway, I'm a rebase lover myself. Jo=C3=A3o > --000000000000b11d1b05caaf1300 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Sun, Aug 29, 2021, 09:23 Drew DeVault <sir@cmpwn.com> = wrote:
On Sun Aug 29, 2021 at 10:21= AM CEST, Eli Zaretskii wrote:
> I no longer remember the exact details, it was something we bumped
> into during discussions when Emacs switched to Git. AFAIR, it had to > do with working on a feature branch and frequently rebasing it onto > the latest master (so that the feature branch doesn't diverge too<= br> > much), then later merging from the feature branch to master.

Hm, weird. I would like to see some reproducible evidence of this so
that a deeper investigation can be done. I've used rebase thoroughly fo= r
many years on hundreds of projects without any such incident.

If the branch = you're integrating via rebase happens to have merge commits of its own,= and you don't pass and/or fully understand what --preserve-merges does= , it's possible I think. If you always always merge, it doesn't hap= pen. Neither does it if you always always rebase, I guess. So I guess the a= rgument can be spun around into a counter-merge argument, I guess. Anyway, = I'm a rebase lover myself.

Jo=C3=A3o
--000000000000b11d1b05caaf1300--