From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Mon, 30 Aug 2021 01:27:39 +0300 Message-ID: <45ab6f2a-07de-3f27-34d6-7fb52f6ac6ba@yandex.ru> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1500"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 Cc: philipk@posteo.net, danflscr@gmail.com, theo@thornhill.no, emacs-devel@gnu.org, monnier@iro.umontreal.ca, larsi@gnus.org To: Drew DeVault , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 30 00:28:29 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 1mKTHv-0000EB-TB for ged-emacs-devel@m.gmane-mx.org; Mon, 30 Aug 2021 00:28:27 +0200 Original-Received: from localhost ([::1]:39502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKTHu-000315-DJ for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 18:28:26 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKTHF-0002IS-BG for emacs-devel@gnu.org; Sun, 29 Aug 2021 18:27:45 -0400 Original-Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKTHD-0001IM-CE; Sun, 29 Aug 2021 18:27:45 -0400 Original-Received: by mail-wr1-x42a.google.com with SMTP id t15so13505961wrg.7; Sun, 29 Aug 2021 15:27:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=pKBKR67uU8+9mFZx8jVfcjGCZz6+ReRjtmTSfnYCO0E=; b=ZSFpAwI++XB8qLweAjotjZdfbk9QUUJ/FqfhON5PwaV3Qw0u22uoyuLABG4/MYwDEp Ju3aOILWIyxDDK7J4KAyGqro6AwiAB68rFN+Aez5wGBFRKkaEvWZ20FesrrxxdjEJ0YH AGY6BNWDkP++q8B3D5KgZQ7ZVpyFSmzqrMSVNn3WBU16jeHvDrSXgRK57GEs6889AUN+ UYI6Up2jsVnwQghXalFkMd5y/K/d6gWifqoKfm5aZsdrcb81Q3j9CvynpQBBr89VSTUg HrSQu7eRQrXGoLRIbF8AmVcWhqN0LRNt+t6YBlIUF4hBkkK/4kbFI+ntIGg4TBUc48zA Fn3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=pKBKR67uU8+9mFZx8jVfcjGCZz6+ReRjtmTSfnYCO0E=; b=BEuJfaEXERE/YgkJolj0ddnjN9PcyNoB/sqtmsRBDUCg+Te1gRNkXh1/UWuAPDvWQp PRTxXvzGD+CbHN/t2xXp5zBCOUVEdRVLBw72E54ePRyj2s2U/E6HVpUFh8Yp7YXXs7gD EPyQ1rEQTZDJY0unzT3GFRhB6MHsUDGfvaFT0Nib91+CpCXnz1jnWktZ+9pqPIRckpZf c4exKGcyE+jvCJvjzvw8n50JBCfTl3QSrHKD0mofAHomgCRIfiVDV3ybkMH+1MFHeptT F4YWdYS15IyQsPMP0vTymT8D+zpsBdKVSC8b+VnA0WOgII6fyqI7HoD6PMJ2ZYeqe9Sr iRzQ== X-Gm-Message-State: AOAM533hfJRHidkJe95FwrXQMwBipEIbVHsXFSKzESmstAbe7LlruQQb CPVMHfbXqbCrqvdNP9IMi4PNev/qOdY= X-Google-Smtp-Source: ABdhPJyJGHHKaGNVvROhH5zfLSt6qB9kpW2/bFb/zOaR8TBjYEbETfflW/54bBjv3DB/N5zkOYgaMw== X-Received: by 2002:adf:e10c:: with SMTP id t12mr22706438wrz.36.1630276061615; Sun, 29 Aug 2021 15:27:41 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id b4sm13255809wrp.33.2021.08.29.15.27.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 29 Aug 2021 15:27:41 -0700 (PDT) In-Reply-To: Content-Language: en-US Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=raaahh@gmail.com; helo=mail-wr1-x42a.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_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-0.58, 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:273437 Archived-At: On 29.08.2021 10:42, Drew DeVault wrote: > On Sun Aug 29, 2021 at 9:38 AM CEST, Eli Zaretskii wrote: >> Rebasing is not just intimidating, it has real problems as well. One >> problem that particularly bothers us is that it could, in some >> circumstances, cause the same commit to be present more than once. >> >> I find a hard requirement to use rebase to be user-unfriendly, because >> some of us simply don't want to rebase, for reasons of preserving the >> original history of the development. Is rebasing really a requirement >> in SourceHut? > No, it's not a requirement. It's just something I think is a good idea. When you say it's not a requirement, how does the alternative work? Suppose I have a feature branch scratch/exciting-new-feature. And it has a number of existing commits A, B, C, where I did some work on said feature. Then I do a merge from master, creating a merge commit M which resolves a conflict. It also pulls commits M1 and M2 from master into the branch, both of which have a later creation date than A. Then I add commits D and E with some subsequent work. What do I do next, to submit the new version of the code? If I try to submit that branch's contents from the web UI, and I need to select all the commits which include the work: - Does the Prepare Patchset UI show commits M1 and M2? What happens if they get selected (residing chronologically between A and E)? - Does the Prepare Patchset UI show the merge commit M? If yes, what happens with it later if the patchset gets approved? Does it turn into a "real" merge commit?