Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e6KXp-00040Z-3R for pgsql-docs@arkaria.postgresql.org; Sun, 22 Oct 2017 18:00:17 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1e6KXn-0003JQ-EI for pgsql-docs@arkaria.postgresql.org; Sun, 22 Oct 2017 18:00:15 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1e6KXm-0003HY-0b for pgsql-docs@postgresql.org; Sun, 22 Oct 2017 18:00:14 +0000 Received: from mail-lf0-x234.google.com ([2a00:1450:4010:c07::234]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1e6KXi-0003Xs-LO for pgsql-docs@postgresql.org; Sun, 22 Oct 2017 18:00:12 +0000 Received: by mail-lf0-x234.google.com with SMTP id k40so17780767lfi.4 for ; Sun, 22 Oct 2017 11:00:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=ScdEdpGdWwdBg5K0yNRmRvcwdG79Y4Id51olO7MPcKI=; b=rq84HpvCOtQ70ZnI0AYypQXKu9T7/1EqwSBN4P7d0fA2Im3HaVhZaq1Rr/YPoRcpPR WoaQ2jvrJav8jbg4o2IfIjyWFuUar3FgktXbieuGSBLM/krWdLCEJBGNQDN5ZccgSKtu aaQ8JBUBodZt7UN2OHe7ZOINvQ+JHFtV7WuHGRzt687E78y8CWjtTckzTDmuvihllDUx GK0SuvVSaQ5LutlBvZT4GZfpAyjFS8IEXi4N41JKbSOtqgQjiSa4kGG9kOXLhVjE5Nnf 3qUiGRAu6dr4d1rFnpOD0VqWqZLSXHGbHXvqqcAHKPkj6N2FMVW+K7dv5j1OktRu72iR WKtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=ScdEdpGdWwdBg5K0yNRmRvcwdG79Y4Id51olO7MPcKI=; b=ooZ+68eI1lmr6Gp7DcZ4heLQlCzicB4qRBo6KCKjYKLgmoBeFOy2ZXUeKTRdcjpo/8 13D3VN45O5bA0z5EdQQHOHWhsQhHBw5W9kOVDE4ysL2o8z7Db3l1L8dMDGLwiZrw9dQ1 2cizW5kN+3ioRpFXdet7V11AWTNSNhiV9y7UrySS128y0sn8SyE0XPuFGShPyiUhPWqt h4TIQ8cvdaB2sAeS9/R8dV2obgKxOhHim5JmVoP2vTcrB+WH/ns5GjukWDIwmS0Ua6eR 3VoI3QxvBzeSJAHBNPeEe+9DTK59Xij5yFycZrH4Gpzgd22XZI2ueLIfylk36jDY7Iwx wXiA== X-Gm-Message-State: AMCzsaWLg185ADc5vBLlPaPVSQDtrL6tVWgWIyMnI911UkPj+TMNIGCy SKV1cEQp8pzGgPOn3Uy7LwJLkA== X-Google-Smtp-Source: ABhQp+Sl2AiHSo4uPs6LzYAWnMpM01SM7WJx2hr6FF+sim6mKqIMqdBMQzU2JOcEM2KF4SJoKEP81Q== X-Received: by 10.46.89.146 with SMTP id g18mr4281210ljf.53.1508695208002; Sun, 22 Oct 2017 11:00:08 -0700 (PDT) Received: from [1.0.0.7] ([178.155.4.15]) by smtp.gmail.com with ESMTPSA id h86sm1105758lfl.59.2017.10.22.11.00.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Oct 2017 11:00:07 -0700 (PDT) Subject: Re: backpatching documentation after conversion to XML To: Tom Lane Cc: Peter Eisentraut , pgsql-docs References: <609dc528-6eab-522d-5b7d-842bd83159e5@2ndquadrant.com> <14052.1508690564@sss.pgh.pa.us> From: Alexander Lakhin Message-ID: <8bb5a579-5a9d-3aad-7b27-275b0b9bb4c2@gmail.com> Date: Sun, 22 Oct 2017 21:00:06 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <14052.1508690564@sss.pgh.pa.us> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgsql-docs Precedence: bulk Sender: pgsql-docs-owner@postgresql.org 22.10.2017 19:42, Tom Lane writes: >> I think we should make a script to backport doc/-related commits. > That's an interesting idea, but I really doubt that you'll be able > to make a script that copes with this without having back-patched > the changes we're discussing. As an example, any given closing tag > might've already been spelled out in the back branches; we've never > been consistent about that. So you couldn't just automatically > shorten all the closing tags and expect to have a patch that applies. I understand the major difficulties we have to deal with. I have the following plan in mind: 1. Get a diff for a single xml. 2. Find corresponding sgml in the old target branch. 3. Convert the sgml to xml following the same procedure that we applied for the master branch. 4. Try to apply the diff. 5. If it's applied successfully, detect the lines where changes occured (sgml->xml conversion doesn't move the lines) and modify corresponding lines in sgml with the content modified for sgml ( changed to and so on.) I think this should work for 90% of cases. ------ Alexander Lakhin Postgres Professional: http://www.postgrespro.com The Russian Postgres Company -- Sent via pgsql-docs mailing list (pgsql-docs@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-docs