From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 2KKvByahcWVXtAAAG6o9tA:P1 (envelope-from ) for ; Thu, 07 Dec 2023 11:40:38 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 2KKvByahcWVXtAAAG6o9tA (envelope-from ) for ; Thu, 07 Dec 2023 11:40:38 +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 0C8836611B for ; Thu, 7 Dec 2023 11:40:38 +0100 (CET) Authentication-Results: aspmx1.migadu.com; none Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBBnF-0003pS-Bv; Thu, 07 Dec 2023 05:39:45 -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 1rBBnE-0003p8-9D for emacs-orgmode@gnu.org; Thu, 07 Dec 2023 05:39:44 -0500 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBBnB-00057c-8q for emacs-orgmode@gnu.org; Thu, 07 Dec 2023 05:39:44 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id A78F5240029 for ; Thu, 7 Dec 2023 11:39:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1701945578; bh=bGCGUNTXwiWNVx5QMR3HPmb/F9XprD29y42Bzaud6Yg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From; b=U0fnDDfy8PBQHctSAXEuipy1ziGJFY6J8sjVQE4vlvL5aaBV7hHa4EBxNk27OZgGh uC0nSSP6CbQfWLvdhHdvtbI1UpZvrIbagswXIHGqgu1goxqPcPEn43K7kPIMDIDAZk dJGgMS8dIZcy/IKm5VT3FKGe81X/3BOwy6fTq6rYic3t187B+aFyZbNtvD7yuPyNB5 EjwYOzGt7QxjZRtovc+MX+XfF5qEDgLeTKZ/eMtKwMySDxNW/jiixQeFCxOP/q4pHF Qf2/rn101lHSVWFmTpHGifeme78oTY+IbUSxVypmx18tAipcn4Ng18Vq9+8YkhRhNk UYavrZwbB+jww== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Sm9kf1BjLz6txZ; Thu, 7 Dec 2023 11:39:37 +0100 (CET) From: Ihor Radchenko To: Kyle Meyer 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: <87r0jytxz9.fsf@kyleam.com> 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> <87r0jytxz9.fsf@kyleam.com> Date: Thu, 07 Dec 2023 10:42:41 +0000 Message-ID: <875y1a47ku.fsf@localhost> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=185.67.36.65; envelope-from=yantar92@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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-Queue-Id: 0C8836611B X-Spam-Score: -4.00 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -4.00 X-TUID: e04axF645+vM Kyle Meyer writes: >> 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. > ... > 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. > ... > 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(-) I see now. I guess I did not really have a full understanding of the purpose of emacs-sync. So, it might be helpful to add a similar explanation to worg/org-maintenance.org. >> 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. I was mainly concerned about complex conflicts that might (theoretically) occur. But it indeed does not matter if the conflicts are limited and manageable. >> 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.) My idea was not to sync that another extra file at all and leave it in Emacs repo only. But the same will not work for xml and other diverging files. I now don't see any reason to change the existing state of affairs. -- Ihor Radchenko // yantar92, Org mode contributor, Learn more about Org mode at . Support Org development at , or support my work at