From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4IvaItCejV5WZwAA0tVLHw (envelope-from ) for ; Wed, 08 Apr 2020 09:52:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 6AQgDNGejV5jRAAA1q6Kng (envelope-from ) for ; Wed, 08 Apr 2020 09:52:17 +0000 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 19C6594524F for ; Wed, 8 Apr 2020 09:52:15 +0000 (UTC) Received: from localhost ([::1]:33496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jM7NS-0002bu-Vx for larch@yhetil.org; Wed, 08 Apr 2020 05:52:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42373) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jM7Ie-0007tM-I4 for emacs-orgmode@gnu.org; Wed, 08 Apr 2020 05:47:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jM7Ic-0003yb-W6 for emacs-orgmode@gnu.org; Wed, 08 Apr 2020 05:47:11 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:33198) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jM7Ic-0003r8-Op for emacs-orgmode@gnu.org; Wed, 08 Apr 2020 05:47:10 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 48xzvS37dmzQlJN for ; Wed, 8 Apr 2020 11:47:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id 1X_L4zRbnwoq for ; Wed, 8 Apr 2020 11:46:56 +0200 (CEST) References: <87sgheid89.fsf@luisa.c0t0d0s0.de> From: Albert Krewinkel To: emacs-orgmode@gnu.org Subject: Re: Org <-> Gitlab Wiki In-reply-to: <87sgheid89.fsf@luisa.c0t0d0s0.de> Date: Wed, 08 Apr 2020 11:46:55 +0200 Message-ID: <878sj6tils.fsf@zeitkraut.de> MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 471471739 X-Rspamd-Score: -4.15 / 15.00 / 15.00 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 80.241.56.171 X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=default; t=1586339535; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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; bh=XKDQsGVuUtcYZ4Ur6C7lxiThNAYk69+61V6wiA0L8Gs=; b=C2CJ0S+rq6wcfGYU2OyTid2yWikXCYfBvUMKJokyg43+JNixxdDVZQ0GocvkJO6/QrqHMB /O43B55EEAuH6fWpNiBGdXxLfwD2631VcRHfAwcVpE4LOQ68UFYGrlHStWZF/90w75Rb8D ue3uWdl1n85yOcMRveEq/qdl4XJ9ySY= ARC-Seal: i=1; s=default; d=yhetil.org; t=1586339535; a=rsa-sha256; cv=none; b=eDmDDxFDd0gpmKSjpw58b5S6dJm2Jls/wshCOpUW3UP2w3Ut6bgzQrwXgx5R9fJL9WGSXQ thkZB3essqAaAArzevMXQA66WlIGRzVte9Bzc8b85jBvP0DZ2r4rZ4MQZ/AlRIrjwfciqy 4vNj7uyWZ+JWFXYaYupwFrOMoIBMrXM= ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=zeitkraut.de (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Scanner: scn0 X-Spam-Score: -0.91 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=zeitkraut.de (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Scan-Result: default: False [-0.91 / 13.00]; GENERIC_REPUTATION(0.00)[-0.58210432877956]; R_SPF_ALLOW(-0.20)[+ip4:209.51.188.0/24:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.31), country: US(-0.01), ip: 209.51.188.17(-0.58)]; TO_DN_NONE(0.00)[]; ARC_SIGNED(0.00)[i=1]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:22989, ipnet:209.51.188.0/24, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[larch=yhetil.org,orgmode]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[albert@zeitkraut.de,emacs-orgmode-bounces@gnu.org]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[emacs-orgmode@gnu.org]; HAS_LIST_UNSUB(-0.01)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_SEVEN(0.00)[7]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[zeitkraut.de : SPF not aligned (relaxed), No valid DKIM,none] X-TUID: rzUgoVOlh3wc Hi, Michael Welle writes: > using ox-gfm to export Org to Gitlab's markup syntax (for the wiki for > instance) seems to work quite nice. Gitlab's Org parser has some > shortcomings, so using Org syntax directly in Gitlab often results in > strangely rendered documents. What I'm interested in is a 'roundtrip > workflow'. If someone else changes the wiki, is there a way to get that > changes back and merge it semi-automatically into the Org file? I guess > I have to check out the wiki repository, get the diff between the two > markup versions and then apply that manually to the Org file. Your should be able to take a shortcut here by using pandoc for the conversion back to org. It might even make sense to use pandoc for the opposite direction as well, but org-mode exporters are usually better at that. See https://pandoc.org and https://pandoc.org/org.html -- Albert Krewinkel GPG: 8eed e3e2 e8c5 6f18 81fe e836 388d c0b2 1f63 1124