From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: feature/package-vc has been merged Date: Sun, 13 Nov 2022 00:16:57 +0000 Message-ID: <871qq7yah2.fsf@posteo.net> References: <164484721900.31751.1453162457552427931@vcs2.savannah.gnu.org> <875yg1bc02.fsf@posteo.net> <878rkxgpms.fsf@posteo.net> <87sfiyk3a2.fsf_-_@posteo.net> <87mt948pmo.fsf@posteo.net> <87fsevyxnt.fsf@posteo.net> <87zgd1f70g.fsf@posteo.net> <878rkkbj90.fsf@posteo.net> <87edua7jw5.fsf@posteo.net> <878rki7jf3.fsf@posteo.net> <871qq81u3m.fsf@posteo.net> 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="20577"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Stefan Monnier , Richard Stallman , emacs-devel@gnu.org, 'Eli Zaretskii' To: Rudolf =?utf-8?Q?Adamkovi=C4=8D?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Nov 13 01:17:42 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 1ou0gu-00052y-H2 for ged-emacs-devel@m.gmane-mx.org; Sun, 13 Nov 2022 01:17:40 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ou0gI-0000dU-UF; Sat, 12 Nov 2022 19:17:02 -0500 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 1ou0gH-0000c4-DV for emacs-devel@gnu.org; Sat, 12 Nov 2022 19:17:01 -0500 Original-Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ou0gF-00029M-Qw for emacs-devel@gnu.org; Sat, 12 Nov 2022 19:17:01 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4C4C2240103 for ; Sun, 13 Nov 2022 01:16:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1668298618; bh=0kAdeSc78UqGLXRWb5LqxYh8JSnugM9SqJYMc3vVUeY=; h=From:To:Cc:Subject:Date:From; b=i66GaU0XhqvfW7BQ+6oM0IZur7J5plko6+2Q2SZ+NQ/ymGvaDSMsthEfhwJ1Ju7d7 dgXMzMcJAo0j3nLfd4bEfT4/ylWX3QRbGB46ZjTcZsuWaNwdvvJ64zdRS5BrjVSXF6 FuL+hJfvz6ffJicA9EH0HNF204Nc3yHBJPmAh2ibMpJPQNQQV79BfWQExc77aFbwPT YoC6jMyWAsVVmvNsi711r5LppEH50POsp12kawkys2cABpaHepRwCZB9/0OmMW+ev7 Up+W5YiNtTk761B2EPHp4hRRYDBO1HkRqeihfmATrQHehmFYdUXUUtdOS2PFvrvydq YY5ck4OTREVPA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4N8tKj24xHz9rxG; Sun, 13 Nov 2022 01:16:57 +0100 (CET) In-Reply-To: ("Rudolf =?utf-8?Q?Adamkovi=C4=8D=22'?= =?utf-8?Q?s?= message of "Sat, 12 Nov 2022 23:57:56 +0100") Received-SPF: pass client-ip=185.67.36.66; envelope-from=philipk@posteo.net; helo=mout02.posteo.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:299687 Archived-At: Rudolf Adamkovi=C4=8D writes: >> I am still confused as to how the error came about in the first place > > I will re-test. Great (thank you for taking the time and your patience, btw)! >> OK, I'll add it then. > > Thanks! > >>>> [...] I haven't been able to push because emacs.git is preventing me >>>> from force pushing. I'll try to get them up there some other way, >>>> and then rewrite the history before rebasing the changes onto >>>> master. >>> >>> So much for "scratch" branches. :-/ >> >> I am not sure what you mean? The issue has since been resolved. > > I thought you could not force-push to the scratch branch. I can delete the branch and re-push. Not nice, but there hasn't been a need to force-push since my last mistake. The newest state should be available on the scratch/package-vc-fixes. > Rudy