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: Emacs git repo mangled Date: Mon, 31 Oct 2022 16:11:54 +0000 Message-ID: <87o7tsug51.fsf@gmail.com> References: <875yg0ypvp.fsf@gmail.com> 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="3932"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Michael Albinus , emacs-devel@gnu.org To: Payas Relekar Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 31 17:11:40 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 1opXO0-0000vE-1D for ged-emacs-devel@m.gmane-mx.org; Mon, 31 Oct 2022 17:11:40 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opXNJ-0002ab-Jl; Mon, 31 Oct 2022 12:10: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 1opXNB-0002Un-D3 for emacs-devel@gnu.org; Mon, 31 Oct 2022 12:10:49 -0400 Original-Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opXN9-0006qh-Ms for emacs-devel@gnu.org; Mon, 31 Oct 2022 12:10:49 -0400 Original-Received: by mail-wr1-x42e.google.com with SMTP id h9so16717098wrt.0 for ; Mon, 31 Oct 2022 09:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cmf/4vbaKqmRwrv0S1xaDQaylZn7bWTZPtkJE6/9VDY=; b=ma8blrxcU/5V8YC6dmEnoP+8EC2ux4MMueITGHyJXQM6dFIusRRWnsITCrYqkIiYxL PNNhI2MZxu0KT9+y9dgj3x2+3paTiOnwmfYallfoZuohlCGPJxvl4rjEWMEDcdhwvAMb IfjVsQlaqH45GKeL3SE24/iEFiVRGZBS58FQJbwNFLuwO2AdVe1nU3olq2r6+pw/r3Ts N1PSlQumCBbI7bwu13qrgSMzLhyHQwuu5SX03GdnGXkdC/dr3h3L+JvQZ+iinD8L0frl mT/GnF2cgrj5xaL0b26ekQC0S3Ef4veajUNnMwlns00Rd9W09K+NcZJNytbpbmjZatWx 9Abg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cmf/4vbaKqmRwrv0S1xaDQaylZn7bWTZPtkJE6/9VDY=; b=UEb3NAzNYMiH2hkClQ4rPmaPJIjlseMNwX+t1ixuNosJGJ21kEI1YcOPeyTd9X38Gq iBYVxzvJ8uZWU0kuWFskOrpZB3lLwykEw8DxXA4U0CgsOcmFum0SP6fLSjUnrN2GTqQD n1OQk69mxbaCJ9YP4nDILTI+bORp59ZtXqOxjYQCFFVhNguPYwVbACW/b+FvsX8Tbyrc Ay21k/Uz3u5TDwTT860KOujnGt13m6qV78F43c2c1H0JPGdDgqKhklATcBMvSJT/qGbs wv/vEnFLHFmVFM919YR5R8CwBPwx+M9PZ0yGBkrMBuh0psMU05qeYI6b2UYnK+gn1TxT EUVA== X-Gm-Message-State: ACrzQf2IKg3euxmnX0xON4c4FXL6dkqG9ytCSrlQ7r9PTinrP8XooRJn KdJlPrKdenrWj9GPrQ0p0zP2L/52GDI= X-Google-Smtp-Source: AMsMyM7/GCf+aNPbvz8PjaPf4Qu1Hc5deoUzzJ8xdS/1oik3TcHV2whwPRZj/STT1Qk1CU+7YZ9OLg== X-Received: by 2002:a5d:544a:0:b0:236:77f4:6e15 with SMTP id w10-20020a5d544a000000b0023677f46e15mr8677690wrv.117.1667232645719; Mon, 31 Oct 2022 09:10:45 -0700 (PDT) Original-Received: from krug (87-196-74-163.net.novis.pt. [87.196.74.163]) by smtp.gmail.com with ESMTPSA id u6-20020a05600c19c600b003c6f8d30e40sm8052639wmq.31.2022.10.31.09.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 09:10:45 -0700 (PDT) In-Reply-To: <875yg0ypvp.fsf@gmail.com> (Payas Relekar's message of "Mon, 31 Oct 2022 20:55:27 +0530") Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=joaotavora@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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:298870 Archived-At: Payas Relekar writes: > Michael Albinus writes: > > Adding Jo=C3=A3o T=C3=A1vora as maintainer of Eglot. > > I did write initial sctipts to merge eglot to emacs.git, and might be > able to take a look tomorrow. > > However, considering these commits are already merged, I am not aware of > what the policy is on history rewrites, Jo=C3=A3o might be best to suggest > a solution. I've now looked at the situation, and I still don't understand what's wrong.=C2=A0 As I expected the Eglot branch feature/eglot2emacs is just a branch that shares no initial history with Emacs's mainline until the merge with commit feature/eglot2texi manual, whose firstcommit, authored by Eli, branches off the mainline in baa39e48. Until that merge feature/eglot2emacs contains no files but lisp/progmodes/eglot.el so that ls output, after you 'git checkout' to one of feature/eglot2emacs's commits is for untracked files in your working directory. I detect nothing wrong in the tree: it's exactly what I would expect it to be. But I don't know exactly what Michael is trying to do. Graphically and summarily, this is how the tree looks like now. HTH master f/eglot-texi-manual f/eglot2emacs . . . | . . | final merge | . . (1e5b753bf4) *<-------\ | ---------+ . | | | merge with *<--\ . | manual branch| --------\ | (1e5b753bf4) | ----\ emacs history >* | | | * | | tweaks to manual | | | * | | | * emacs history >* * | lots of eglot | | | history (includes | Eli's commit | * some branching, but | (1e5b753bf4) * | majority is linear). | | | | / * emacs history >* /--- | | /--- * | /--- | | /--- | +- | | | | * Initial commit creat= ing emacs history> * lisp/progmodes/eglot= .el (baa39e48) | (1e5b753bf4) * | . . .