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 15:32:40 +0300 Message-ID: <3e3a5533-4e01-2c10-b0fd-2a041cb7b2de@yandex.ru> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <45ab6f2a-07de-3f27-34d6-7fb52f6ac6ba@yandex.ru> 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="4527"; 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 14:33:40 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 1mKgTs-0000xm-AI for ged-emacs-devel@m.gmane-mx.org; Mon, 30 Aug 2021 14:33:40 +0200 Original-Received: from localhost ([::1]:42314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKgTr-0005E8-4V for ged-emacs-devel@m.gmane-mx.org; Mon, 30 Aug 2021 08:33:39 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKgT8-0004Xp-4g for emacs-devel@gnu.org; Mon, 30 Aug 2021 08:32:54 -0400 Original-Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:56235) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKgT0-00011S-Fi; Mon, 30 Aug 2021 08:32:52 -0400 Original-Received: by mail-wm1-x32b.google.com with SMTP id g135so8676173wme.5; Mon, 30 Aug 2021 05:32:44 -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=vCYft/ktrJ3IvyGt9eqfpeh5Hz6wkcfEjHt+ZmTJYkM=; b=Y2YYSZv9OC9HCj4hPw8P2lDXxyhbtTOHAesxK9lxRrCkvGCfNbt8gb/dxxvuwakstM 9ApJZMfMZHyZt+juCdRMLwIdh4sClAbkei/4WKWaL9bFqxp2bSdn9sUXVNXFppz6g7qu vp/VpEhXiOtIiIV/O6kCYO2Wus2Xol+0mFVNEC5MpHL2kkd1kB6hAZy8dB/7SgVdyHDe ohEJV8zpUdpZZ0mZPK3EjGsmBGDvQkrN4paeAcSOg1QBli0d67qbTq51rZe5LId2By+s l68Zb70kW91U02IrEVGPMOjRKWb3E1k4g7OuzSVwUk2frnO53iDSroJAwHJNbCZR9OpT r0nQ== 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=vCYft/ktrJ3IvyGt9eqfpeh5Hz6wkcfEjHt+ZmTJYkM=; b=qeBwNJkUzF31MOKA9MG1PdKYOzrTl6Cbj2MK8RzQIKYVmYAgTk/n22EYTP4kMgTUog ngRwfO2b9lOJnzKnShkV6E5fPWqDP384pBMT0WVI7Ot5KoWLOvv7a0j5TV2JVFObMPWz sTAaIN8hRQvIlX7Q22FUnafI+8uz0t3oInTAGqnLJOY3aA59tlsCHbD+9OfakCXt5f73 Ua0yIp8aq7oGOjTkx/zcnKpebhsGiBwkHrzQY8ytQHyUo7BDodPxMA7TRAD0T6o54oD9 MaAh7PtbEzEYF27FNHNHUF0I2R7y+gaywIYetmzHRoDVYseFrajyTvVs2tIYVpTrijzA MuXA== X-Gm-Message-State: AOAM531WG4NVr/ny34Zr1EPzs/PXU4rZCB82wQzTMzV5AseVoQbTH69h LVyyoyyGRLBeoD2xDy1i2ac1VDBfZj0= X-Google-Smtp-Source: ABdhPJyjH4vXlKZ8YaxERVmRlK+uT/Oa5Pzv0ezihZY4sfw/Nq8tFe3OdxoKUpGSLXmbYC0oWVEUjA== X-Received: by 2002:a05:600c:1c13:: with SMTP id j19mr17656601wms.109.1630326763387; Mon, 30 Aug 2021 05:32:43 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id b18sm15435105wrr.89.2021.08.30.05.32.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Aug 2021 05:32:42 -0700 (PDT) In-Reply-To: Content-Language: en-US Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=raaahh@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 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.249, NICE_REPLY_A=-0.932, 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:273482 Archived-At: On 30.08.2021 09:31, Drew DeVault wrote: > On Mon Aug 30, 2021 at 12:27 AM CEST, Dmitry Gutov wrote: >> 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. > > Honestly, by doing this you have created a poor git history which I, as > a maintainer, would not care to review, be it via email or any other > means including the GitHub workflow. I would teach you how to rebase it > properly instead of accepting this work, and I think that emacs would be > wise to do the same. So far it has been common practice around these parts, but OK. > However, you can still work with this on sourcehut by using git > request-pull(1): > > https://www.git-scm.com/docs/git-request-pull > > There is no UI for this, but it is planned. Thanks.