Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3E355200BFC for ; Sat, 14 Jan 2017 18:16:00 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3CC7D160B35; Sat, 14 Jan 2017 17:16:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8475D160B2D for ; Sat, 14 Jan 2017 18:15:59 +0100 (CET) Received: (qmail 94021 invoked by uid 500); 14 Jan 2017 17:15:58 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 94011 invoked by uid 99); 14 Jan 2017 17:15:58 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jan 2017 17:15:58 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 0E4E2C09C8 for ; Sat, 14 Jan 2017 17:15:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.699 X-Spam-Level: X-Spam-Status: No, score=-0.699 tagged_above=-999 required=6.31 tests=[RCVD_IN_DNSWL_LOW=-0.7, UNPARSEABLE_RELAY=0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 87YNSsA16r5M for ; Sat, 14 Jan 2017 17:15:54 +0000 (UTC) Received: from einhorn.in-berlin.de (einhorn.in-berlin.de [192.109.42.8]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id E95C35F29A for ; Sat, 14 Jan 2017 17:15:53 +0000 (UTC) X-Envelope-From: stsp@elego.de Received: from jim.stsp.name (jim.stsp.name [217.197.84.42]) (authenticated bits=0) by einhorn.in-berlin.de (8.14.4/8.14.4/Debian-8+deb8u1) with ESMTP id v0EHFlRJ029436 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 14 Jan 2017 18:15:47 +0100 Received: from localhost (jim.stsp.name [local]) by jim.stsp.name (OpenSMTPD) with ESMTPA id 3dfc9f35; Sat, 14 Jan 2017 18:15:31 +0100 (CET) Date: Sat, 14 Jan 2017 18:15:31 +0100 From: Stefan Sperling To: Vincenzo Reale Cc: dev@subversion.apache.org Subject: Re: Italian translation update Message-ID: <20170114171530.4xttywzb5qvfps2t@jim.stsp.name> Mail-Followup-To: Vincenzo Reale , dev@subversion.apache.org References: <20170114121809.wnueyexfj7yajx7j@jim.stsp.name> <2cc2f4af-f4e7-deec-bda1-58fce230e6ce@baslug.org> <20170114134223.7ljo3mesy2l2bqlw@jim.stsp.name> <20170114144714.wy72awlx2pntbnf3@jim.stsp.name> <09da4d93-b767-942e-57d3-7475d93efed2@baslug.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <09da4d93-b767-942e-57d3-7475d93efed2@baslug.org> User-Agent: NeoMutt/20161126 (1.7.1) archived-at: Sat, 14 Jan 2017 17:16:00 -0000 On Sat, Jan 14, 2017 at 05:29:11PM +0100, Vincenzo Reale wrote: > The attached patch should work with 1.9 branch. Unfortuntaly, it does not: $ svn info --show-item url https://svn.apache.org/repos/asf/subversion/branches/1.9.x/subversion/po $ svn patch /tmp/it_19.patch C it.po > rejected hunk @@ -10128,13 +10453,15 @@ Summary of conflicts: Text conflicts: 1