From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Kyle Meyer Newsgroups: gmane.emacs.bugs Subject: bug#32676: Updating Org for 27.2 Date: Mon, 09 Nov 2020 23:10:10 -0500 Message-ID: <87o8k5kg2l.fsf@kyleam.com> References: <20180910050802.25922-1-erjoalgo@gmail.com> <831s9xl54b.fsf@gnu.org> <874leq1hw4.fsf@mail.linkov.net> <87worlgh0k.fsf@mail.linkov.net> <878swkxqo1.fsf_-_@mail.linkov.net> <874kmxz7e0.fsf@gnus.org> <874kmwy7k8.fsf@mail.linkov.net> <878sc8yn0i.fsf@gnus.org> <875z7avb9c.fsf@mail.linkov.net> <871rh7y2rv.fsf@mail.linkov.net> <87ft5nv4r8.fsf@gmail.com> <87tuu2kh8m.fsf@mail.linkov.net> <871rh6w367.fsf_-_@gmail.com> <87lffa6fio.fsf@mail.linkov.net> <87y2jad8s5.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="32098"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 32676@debbugs.gnu.org To: =?UTF-8?Q?K=C3=A9vin?= Le Gouguec , Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 10 05:13:54 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1kcL2X-0008FM-F2 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 10 Nov 2020 05:13:54 +0100 Original-Received: from localhost ([::1]:41176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcL2W-0001tg-9s for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 09 Nov 2020 23:13:52 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcKzm-0006ll-4v for bug-gnu-emacs@gnu.org; Mon, 09 Nov 2020 23:11:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcKzl-0001Fi-QZ for bug-gnu-emacs@gnu.org; Mon, 09 Nov 2020 23:11:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kcKzl-0004YM-Kw for bug-gnu-emacs@gnu.org; Mon, 09 Nov 2020 23:11:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 10 Nov 2020 04:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32676 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed patch Original-Received: via spool by 32676-submit@debbugs.gnu.org id=B32676.160498142217433 (code B ref 32676); Tue, 10 Nov 2020 04:11:01 +0000 Original-Received: (at 32676) by debbugs.gnu.org; 10 Nov 2020 04:10:22 +0000 Original-Received: from localhost ([127.0.0.1]:36076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcKz5-0004X0-7Y for submit@debbugs.gnu.org; Mon, 09 Nov 2020 23:10:22 -0500 Original-Received: from pb-smtp20.pobox.com ([173.228.157.52]:54937) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcKz2-0004Wm-AY for 32676@debbugs.gnu.org; Mon, 09 Nov 2020 23:10:17 -0500 Original-Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id CEAF31012B7; Mon, 9 Nov 2020 23:10:14 -0500 (EST) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=sasl; bh=G9BobSetgT28 9WM5EYPv5UBSV68=; b=h4rmXn072kBvbKwZN+xF9G1KkZjdIeymK6KpT47G/8pv FLN6+ccqPx4tlK5H9vcvynbuI0XcJmOZcguyBKuUqGCY2UNSO1ITB4hdqTvliL4r 2QCRGaKhLDUXEU9ATSO52i5ZahfeA3hgPrkKL/QehE20wocQgpGyjLkrcK4P0LY= Original-Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id C75901012B6; Mon, 9 Nov 2020 23:10:14 -0500 (EST) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:in-reply-to:references:date:message-id:mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=d/y73Lm8lzxwY5c1IADLJgw93aaMJoIrCKyZLH3D/qg=; b=sPqM5OlsQfg3+PhfeqcynV1U3ISTuq9bV5hA9UfMKSIKE7ZxaJUQmoDwehnDGky6kl25ejCPWzQa7HnVJU4WnlvSJ402Df19sbMOydRx713s103+EhNTi/uiA7l8Jx7iivXdIB1Xb3SRKbw280zRZYaLuMlXUCyTYAnig+52duI= Original-Received: from localhost (unknown [45.33.91.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 21E201012B4; Mon, 9 Nov 2020 23:10:12 -0500 (EST) (envelope-from kyle@kyleam.com) In-Reply-To: <87y2jad8s5.fsf@gmail.com> X-Pobox-Relay-ID: A0EDECEC-230A-11EB-A91A-E43E2BB96649-24757444!pb-smtp20.pobox.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:192989 Archived-At: K=C3=A9vin Le Gouguec writes: > Juri Linkov writes: > >> Do you know if the synchronization process will override the changes >> made in master? If I fix an issue in bug#44524 and will commit the fix >> to Emacs master in the subdir emacs/lisp/org, won't the synchronization >> process of the recent Org version override my fix? > > The document I referred to covers this situation (=C2=A7 Backporting chan= ges > from upstream Emacs), but I don't know if there are automated checks in > place to make sure no commits are missed. No, there's not. I check at least once a week and propagate (or otherwise deal with) any commits from the Emacs repo that touch Org files. I have a fairly dumb system for it, but I think it's worked well enough [*] in terms of catching commits. It's essentially just a command (described in the document you're referring to, I believe) that does git log .. -- to get a list of commits that go into an Org checklist. The occasionally time consuming part is dealing with the conflicts and with commits on Emacs's end that don't maintain compatibility with the minimal Emacs version that Org supports. [*] That's not to say that I think the current system of porting and then syncing via manual copying is a good one. I look forward to $something better, but in the meantime things need to stay afloat. At any rate, since 2015, I have notes on all the commits considered. I moved these from my personal notes repo to a dedicated repo in 2019. In case it's helpful, I've just pushed it to . If you're worried a commit didn't get considered, you can first check in the Org repo with $ git log --grep=3D since the commit messages use a consistent format that includes the full hash. As an example: Backport commit dd16e46bb from Emacs ; Prefer https to http in more URLs dd16e46bb9d0099baea06d780ad8f62728addc2e Stefan Kangas Sat Oct 24 20:23:27 2020 +0200 If you don't see it there, you can look into the notes file referred to above, which should contain some information about why the commit wasn't applied and what was done instead (with an Org commit reference). (Now that it's public, going forward I'll try to make the descriptions a little less of a brain dump.) That said... > IIUC, Org maintainers prefer for changes to be submitted to > emacs-orgmode@gnu.org; they only occasionally dive into > bug-gnu-emacs@gnu.org to look for open Org issues. ...submitting patches on the Org list is of course appreciated, particularly for things that target Org rather than being part of a tree-wide cleanup.