From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Theodor Thornhill Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Sun, 29 Aug 2021 10:30:54 +0200 Message-ID: References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <834kb8mzk1.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19948"; mail-complaints-to="usenet@ciao.gmane.io" Cc: dgutov@yandex.ru, larsi@gnus.org, danflscr@gmail.com, philipk@posteo.net, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Drew DeVault , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 10:32:07 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 1mKGEY-0004yQ-8a for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 10:32:06 +0200 Original-Received: from localhost ([::1]:46564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKGEX-0008Fg-28 for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 04:32:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGDZ-0007UF-Sg for emacs-devel@gnu.org; Sun, 29 Aug 2021 04:31:06 -0400 Original-Received: from out0.migadu.com ([2001:41d0:2:267::]:37741) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGDW-0006LR-Gz; Sun, 29 Aug 2021 04:31:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1630225857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IFtO4UjSulRrUoZ7ijyXkfW/nitk0bgyPOYTZ4dRw0Q=; b=nYtD8xAa05dPAfG/lfOcA+0zg1+7kv9MOCar+Ws9BiR0NY/hQYdXneLb/i+ZTaq6Y8LK2B 35viDaj0um+PQULaMAcWPMc6VipjQ91k8+urG2vCfIV4Wgg+g/hGZ3wGromIS0Q9Hihgls snJTbcXaDuriC1lCgfJvDMqxEVAlRYx7S/u4UB3wl13NdFPgO1WHoWZGZ5lJWR/SfZ221T uPIXREPomkGDcrsTmd0/RwoVs3KZlWJZY3Dn6Rtaf+/ASKPBy+kEAKbkMT3NdAU2tdIB8Z auYgU440C1ElOiRUwJnXqZ3PUROv4glJVpGljCzMGI4Syxe3ETpnHZ6XCmz6Dg== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-Reply-To: X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: theo@thornhill.no Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=theo@thornhill.no; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, 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:273387 Archived-At: On 29 August 2021 10:23:17 CEST, 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=2E 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=2E > >Hm, weird=2E I would like to see some reproducible evidence of this so >that a deeper investigation can be done=2E I've used rebase thoroughly fo= r >many years on hundreds of projects without any such incident=2E > I know one way to do this, after having to untangle a coworkers mess a cou= ple of years ago: 1=2E Create your branch 2=2E Make some commits 3=2E Push them because work day over 4=2E Next day realize you should change something 5=2E Edit history 6=2E Get message from git that remote is diverged, pull to fix 7=2E Get a million conflicts with old commits 8=2E Resolve conflicts 9=2E Force push 10=2E Since this took all day leave work 11=2E Go back to 4 You won't believe how crazy this case become=2E I've seen same commit at l= east 6 times in the same pr=2E