From users-return-27249-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Thu Jun 28 16:43:11 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id A905D180662 for ; Thu, 28 Jun 2018 16:43:10 +0200 (CEST) Received: (qmail 4917 invoked by uid 500); 28 Jun 2018 14:43:09 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 4889 invoked by uid 99); 28 Jun 2018 14:43:08 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jun 2018 14:43:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 51655180833 for ; Thu, 28 Jun 2018 14:43:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.001 X-Spam-Level: X-Spam-Status: No, score=-0.001 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001] autolearn=disabled Authentication-Results: spamd3-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=daniel.shahaf.name header.b=joo/3di+; dkim=pass (2048-bit key) header.d=messagingengine.com header.b=IPxUBwD5 Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id ST9iDsdeShwC for ; Thu, 28 Jun 2018 14:43:06 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTPS id 7E3745F485 for ; Thu, 28 Jun 2018 14:43:06 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 74AFB21F44; Thu, 28 Jun 2018 10:43:05 -0400 (EDT) Received: from web6 ([10.202.2.216]) by compute3.internal (MEProxy); Thu, 28 Jun 2018 10:43:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=t/Jhga VbhHnb2YmNGkEw85JpwY8L1lM25vHv3oT2iVI=; b=joo/3di+bzaS/RhOCgtWR3 4vBL53RHfIb2zFfvRYG9mawdjncWSfNuX+fHNJs46DxEgRiOuoAAb9aL9kMQ7OU/ KUc3LlKyVHyhu+2C/Ir0lRpc9hngL816uuvlmDmsvY4co1G0tBnKOb6ucSWDmWph tXvlGg5IuGlFyaqlvJre2Emt1cls5+hE08hUkYr1VuQgKbeFIMMcrpZMSvvjuYRR oXofAfNL+9LCN+cJD8H5Kq5JWbHA+W7oNIAniQvPPF9aW5wTeZ2em9uq0U7VK/3P CwL0tP14ApDNMI/srWvuRyWRNy+zl2vVSGHJKjPbkm5D4/G0e/RPI5O3EJty5ybA == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=t/Jhga VbhHnb2YmNGkEw85JpwY8L1lM25vHv3oT2iVI=; b=IPxUBwD5PU0J5fa2Jie9cz EKiTHRXHRS6tslO5EHdWs832r5ENMia37aymsQ+0eH5DvfHBCosJBus3kAv9kc87 VGvJoWd465ZGrz7a4/jL2rSFaj5//87uR4MNDuX3iJ89r8v9+F6ICUv1JOz6kpwD AJVsCFFHWhb+xaUjyxc08Tqzkfy/Tcivn1kTInA7geIkS8RQmi2ZdH8abtwRYMbu uVkg9LSesoJfP+a6SHFSt/z4MEq9IkkGkzdPlciaX6IH1OwDntlreR421AN0Nidc GJXh3DAgv6UjdVMN+abfDSgA92Me9dmtG1ieOLhBSrpdpDswurK8f+qsq4jih82Q == X-ME-Proxy: X-ME-Sender: Received: by mailuser.nyi.internal (Postfix, from userid 99) id 3495C4339; Thu, 28 Jun 2018 10:43:05 -0400 (EDT) Message-Id: <1530196985.3488008.1423552192.63F47CA1@webmail.messagingengine.com> From: Daniel Shahaf To: Dipu H , Johan Corveleyn Cc: users@subversion.apache.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" X-Mailer: MessagingEngine.com Webmail Interface - ajax-0d8ea36c Subject: Re: SVN patch issue with property changes In-Reply-To: <8E2D1D14-74F0-414E-ADFB-51E3484E1D41@juniper.net> Date: Thu, 28 Jun 2018 14:43:05 +0000 References: <431EBEF6-3B1E-4886-84D6-1380BB5EF5C8@juniper.net> <8E2D1D14-74F0-414E-ADFB-51E3484E1D41@juniper.net> Dipu H wrote on Thu, 28 Jun 2018 14:24 +0000: > Looks like svn is not able to properly handle the svn:executable > property changes via patch. Works for me: [[[ % svnadmin create r % svn co -q file://`pwd`/r wc % cd wc % touch iota % svn add -q iota % svn ci -q -m add % svn up -q % svn ps -q svn:executable yes iota % svn diff > foo % svn revert -q iota % svn patch -q foo % svn diff Index: iota =================================================================== --- iota (revision 1) +++ iota (working copy) Property changes on: iota ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property ]]] You mentioned earlier that svn:executable was present with an empty value. Is that really the case? If it is --- which would be surprising, as it's supposed to be an impossible state --- it would explain why you got a conflict.