From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id YHtVKQRQcWXEgwAAauVa8A:P1 (envelope-from ) for ; Thu, 07 Dec 2023 05:54:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YHtVKQRQcWXEgwAAauVa8A (envelope-from ) for ; Thu, 07 Dec 2023 05:54:28 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0E5D4347B7 for ; Thu, 7 Dec 2023 05:54:27 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=kyleam.com header.s=key1 header.b=iA3+qq8z; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701924868; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=bnID71Q3CKaLDpBCxzZF+WcyBcqi8WWHz/I5qEznq3U=; b=lYt9xUf8xSxBZMH3hk1eCKqwHkQERM/spIpZkhBdByTPix6M5mcgnum7K6dVL/G/TgMK1j dXRq+tQfrDE8BVj+rHPCUtk4+z0R8ZdxSvuzWgyV7xJPBKKvcAZW+uCCZEqteYGZ0cFSKQ QQcV/NFFWgzMUw1iESocz3YSlNwXtT2WRA5QMP5sL4K3kifT/M7G73OQP9INQ02THO8jVt +hh1N9Nvef6htjkCoQZy7LClGz5Gr1u34OlCRB9214AWHpDrDNQGEvXFo+ksC05YXrsXf8 mqCtq56lbBM2BenFXrftnuOkOKDAWMySjEdTfpSowpOAHSYKydX5LStIAxGaRg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=kyleam.com header.s=key1 header.b=iA3+qq8z; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701924868; a=rsa-sha256; cv=none; b=RdKrH+8kNTo3+RbH9oC+5P3Feu1IkGxiQ0BME1BCw8mNPxL2oOELI6Rdjx1QFRRbrF/9Xu ykzxPdml/89CiXGDxX/bggUeevvQRL11h3jbKlVRvyEEv3JSfEfPsVsysoUv9SXE1TzSI3 32BAOiCxJirXxndKTN3rfeEvzToM5YiXUcSxZEmI1HV7zEUwl40OUgltagYl10lV9T4QsH xH3mRbwGy1z62O0P+izfTtzfqR0DgDc6QEEC86fm+ruX8zEWzTqcqO+Lx/BAvaiTd3KHgN zptqdYfyA7ZP8Wj5AyqSNDdExL8p6FMDNDiaSeP0FQ8pNTX3ZGqZ3cqwQw0w4w== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rB6OC-0000Od-WF; Wed, 06 Dec 2023 23:53:33 -0500 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 1rB6OA-0000OU-6R for emacs-orgmode@gnu.org; Wed, 06 Dec 2023 23:53:31 -0500 Received: from out-175.mta1.migadu.com ([95.215.58.175]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rB6O2-0008D3-IK for emacs-orgmode@gnu.org; Wed, 06 Dec 2023 23:53:29 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1701924798; 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: in-reply-to:in-reply-to:references:references; bh=bnID71Q3CKaLDpBCxzZF+WcyBcqi8WWHz/I5qEznq3U=; b=iA3+qq8z6E4xE4ghysdvY4AwJSZSZbCwWcPG+yxScCqWhL38fE/BG2dB5xJtnI1pCeg19I 9nguZdLHtVoxUVRFWk3LrHFuhytfZ+USc/eJzh+GwFeK7ochBtLfhQJqc8FUfSyhdIU8KY /QHa9YbtkrzgcczsBSp84nV2vvivhfhJMWAc5dS6EX58i0N2CRPhq+Vwf7UZm7+PwykMuA +pPBz0u07QHo8GVCstu5YOVK88jR4ar9P4Gw58LImTs/keHwl0jaJBBHZV2WltpMevgDDR 2JOc6MmmtdTzjo9esHyn9xTsLzWy7ge51HrlQiG9gyu8gPSLu7PTGb9MjHlVWA== From: Kyle Meyer To: Ihor Radchenko Cc: Bastien Guerry , emacs-orgmode@gnu.org Subject: Re: Syncing orgcard.tex with upstream Emacs (was: bug#64578: orgcard.tex fixes to allow PDF rendering to be used as a triptych.) In-Reply-To: <87r0jzl8qx.fsf@localhost> References: <874jm8ythh.fsf@localhost> <875y4bbz13.fsf@localhost> <87r0kr9xke.fsf@localhost> <871qcl33o2.fsf@gnu.org> <87ttoym8qu.fsf@localhost> <87wmttti1k.fsf@kyleam.com> <87bkb4x1t8.fsf@localhost> <87ttowt89m.fsf@kyleam.com> <87r0jzl8qx.fsf@localhost> Date: Wed, 06 Dec 2023 23:53:14 -0500 Message-ID: <87r0jytxz9.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=95.215.58.175; envelope-from=kyle@kyleam.com; helo=out-175.mta1.migadu.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.85 X-Spam-Score: -6.85 X-Migadu-Queue-Id: 0E5D4347B7 X-Migadu-Scanner: mx12.migadu.com X-TUID: kY6wMOcUaFKp Ihor Radchenko writes: > I think that a reference to > https://git.kyleam.com/orgmode-backport-notes/tree/orgmode-backports.org#n2 > might be helpful. Okay, I'll make a note to add one. > Maybe we should even have that file in the main repo as a part of > emacs-sync branch? I prefer not to. I intended that branch to track the state of Org files that are synced, not to store auxiliary logs. > I can see the point. Although, I feel like accumulating such divergence > may backfire after some time. How do you see this particular spot backfiring? If Emacs changes the Emacs-specific text (as they did once in 2016), I port that to the emacs-sync branch. Or if Org changes neighboring text, I resolve the conflict on merge into emacs-sync (very likely just taking both sides). The resolution is recorded for anyone to look back on. The emacs-sync branch provides a transparent way to keep track of the limited set of Emacs-specific modifications needed for the sync. We're not talking about an ever-growing set of changes. > May we possibly resolve the conflict properly using something like the > attached patch? Then, we can use the same orgcard source but have > orgcardemacsnotice.tex empty in Org repository. I don't see what problem it solves. It's moving the divergence to a different file (that would still be tracked in emacs-sync), and it adds one more Org-specific wrinkle to the Emacs tree. (Also, the orgcard source would still be different given the upstream hunk in the diff I posted in my last message.) > Are there other similar conflicts in emacs-sync branch? The emacs-sync branch has other Emacs-specific modifications, yes. Again, keeping track of those is the reason it exists. $ git diff --stat bugfix...emacs-sync .gitignore | 1 - doc/{doc-setup.org => org-setup.org} | 2 +- doc/{org-manual.org => org.org} | 4 ++-- doc/orgcard.tex | 7 ++++++- etc/schema/schemas.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lisp/org-version.el | 24 ++++++++++++++++++++++++ 6 files changed, 90 insertions(+), 5 deletions(-)