From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?Gerd_M=c3=b6llmann?= Newsgroups: gmane.emacs.devel Subject: Re: Emacs git repo mangled Date: Tue, 1 Nov 2022 06:44:50 +0100 Message-ID: <88f2ba22-64c4-c835-294e-9367766161e5@gmail.com> References: <87v8o0hrk2.fsf@gmx.de> 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="3934"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Cc: emacs-devel@gnu.org, gerd.moellmann@gmail.com To: michael.albinus@gmx.de Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Nov 01 06:46:24 2022 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 1opk6R-0000oa-UV for ged-emacs-devel@m.gmane-mx.org; Tue, 01 Nov 2022 06:46:23 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opk53-0004CY-R0; Tue, 01 Nov 2022 01:44:57 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opk52-0004CP-2I for emacs-devel@gnu.org; Tue, 01 Nov 2022 01:44:56 -0400 Original-Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opk50-0003I2-Br for emacs-devel@gnu.org; Tue, 01 Nov 2022 01:44:55 -0400 Original-Received: by mail-ed1-x52e.google.com with SMTP id y69so20373201ede.5 for ; Mon, 31 Oct 2022 22:44:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language:subject :references:cc:to:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=YL3EqgnFOZ/9T9DtjG1Q5jA55PPVNYTEnNlFw6aKqzI=; b=gl/P+M7Pc+A3H37ElLjC0gcgLdtlodiBnBj+NxBN4v8+OSaw/zT9Eki2Uhsrgbw00B eqRLEcBtfVVIj/4rL6GfoaQq6cVYJmei2W4XljWDfvmHK4QTod/gB58yNfeYzqTooYgu fKTqyQfma+bg/OkEaAAhgfIeIKiVwwoWp6YiyPIJtlE1oA916TQ2orlDP94YYNGkgjSP doJtmuyWgeGmg4Shb6+3TwIyz3a98jX83awsmQ3fmQRt1mJQ/P7+Xj0NI0cGJ29UjLR6 O9d7eP0vkkerlahbP4MzGmqCC7tBt8jTuBEerlNSkUj1Y2wivxTwX7uSwQYiQrP11ijI 7tqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language:subject :references:cc:to:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YL3EqgnFOZ/9T9DtjG1Q5jA55PPVNYTEnNlFw6aKqzI=; b=x1lWS04RerR5QuUunFJSlPRgBk7jDATI4nDYj6usGJzlQxt2mJBi2F4iPFOEjET1ie KZKrnhq5Kbl6AKIPyjOXlIZUgfLHl2iOAWwtCjhwE4P3nrjnIyoCmcVRO3AcJdhXRkia 8H8C7/8AmW6XJsqBw9WDriqTyLYveTjoa7VDvHg+nfKW8wjwEIE2hFzKRXzo6Ik92PA8 tmHb99Rqbz20W5oFUyHanoWJZEZKEe2CNogmoSL9HtJroZ80gix0yoN/4REzzRiWBB1J DnsHz1dQw0QJfiDWUNtNCn7TpO3VQOTIPtt8HeU1T9kLqEzJWFyo7uHFmIrM2JW8JpPb 0+3g== X-Gm-Message-State: ACrzQf0d5AGAJMRPESAuULleu7weLxcBZs4I9OGWpRtnIte332pokGp/ IzLgBqf++sSheKelDfueji8= X-Google-Smtp-Source: AMsMyM6EFbTYsMwv+aiFi7mgZadyzf+zgH+KLHmu6n23S3kaDHZQENrjs6cyb0FEZxElPF7H2D7CHw== X-Received: by 2002:a05:6402:448c:b0:457:52eb:b57e with SMTP id er12-20020a056402448c00b0045752ebb57emr17638481edb.178.1667281492550; Mon, 31 Oct 2022 22:44:52 -0700 (PDT) Original-Received: from [192.168.178.21] (pd9e36358.dip0.t-ipconnect.de. [217.227.99.88]) by smtp.gmail.com with ESMTPSA id g18-20020a17090604d200b0077d37a5d401sm3804733eja.33.2022.10.31.22.44.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 Oct 2022 22:44:51 -0700 (PDT) Content-Language: en-US In-Reply-To: <87v8o0hrk2.fsf@gmx.de> Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=gerd.moellmann@gmail.com; helo=mail-ed1-x52e.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, NICE_REPLY_A=-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.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298905 Archived-At: > Shall we document this trick? admin/notes/repo is very quiet about > bisecting in general. Does something like this suffice? I don't know at the moment what more to say about this. diff --git a/admin/notes/repo b/admin/notes/repo index 2185c5a003..a65a87bfc6 100644 --- a/admin/notes/repo +++ b/admin/notes/repo @@ -128,6 +128,10 @@ again. This is a semi-automated way to find the revision that introduced a bug. Browse 'git help bisect' for technical instructions. +Depending on what you want to do, it can be helpful to use the option +'--first-parent' with 'git bisect', which makes bisect ignore commits +coming into a branch from merges. + * Maintaining ChangeLog history Older ChangeLog entries are kept in history files named ChangeLog.1,