Return-Path: X-Original-To: apmail-openoffice-dev-archive@www.apache.org Delivered-To: apmail-openoffice-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 606D210BA5 for ; Fri, 30 Aug 2013 11:24:22 +0000 (UTC) Received: (qmail 14706 invoked by uid 500); 30 Aug 2013 11:24:20 -0000 Delivered-To: apmail-openoffice-dev-archive@openoffice.apache.org Received: (qmail 14612 invoked by uid 500); 30 Aug 2013 11:24:19 -0000 Mailing-List: contact dev-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list dev@openoffice.apache.org Received: (qmail 14601 invoked by uid 99); 30 Aug 2013 11:24:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Aug 2013 11:24:18 +0000 X-ASF-Spam-Status: No, hits=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE X-Spam-Check-By: apache.org Received-SPF: error (athena.apache.org: local policy) Received: from [208.113.200.5] (HELO homiemail-a56.g.dreamhost.com) (208.113.200.5) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Aug 2013 11:24:12 +0000 Received: from homiemail-a56.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a56.g.dreamhost.com (Postfix) with ESMTP id B060FFE06C; Fri, 30 Aug 2013 04:23:31 -0700 (PDT) Received: from [192.168.0.3] (unknown [151.67.108.32]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: andrea@pescetti.it) by homiemail-a56.g.dreamhost.com (Postfix) with ESMTPSA id A819AFE06B; Fri, 30 Aug 2013 04:23:30 -0700 (PDT) Message-ID: <522080B0.4050900@apache.org> Date: Fri, 30 Aug 2013 13:23:28 +0200 From: Andrea Pescetti User-Agent: Mozilla/5.0 (X11; Linux i686; rv:13.0) Gecko/20120605 Thunderbird/13.0 MIME-Version: 1.0 To: "dev@openoffice.apache.org" Subject: Recommended way to merge commits to AOO401? Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org What is the recommended way to merge commits to AOO401? As I see it, the textbook steps would be to cherry-pick them from trunk, so: 1) Commit fix to trunk as revision N (in my case, 1518832, affecting main/extensions.lst) 2) Chdir to an AOO401 checkout 3) Check the diff to be applied with something like main$ svn diff -c 1518832 https://svn.apache.org/repos/asf/openoffice/trunk/main/extensions.lst 4) Merge the commit by cherry-picking, with something like main$ svn merge -c 1518832 https://svn.apache.org/repos/asf/openoffice/trunk/main/extensions.lst Is this the recommended way? Or are showstoppers supposed to be fixed on AOO401 first and be ported to trunk later, maybe with a single merge operation? If there are some conventions, I'll apply them for the fixes I'll commit during the weekend. Regards, Andrea. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org For additional commands, e-mail: dev-help@openoffice.apache.org