From users-return-27247-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Thu Jun 28 09:49:03 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 0EB90180662 for ; Thu, 28 Jun 2018 09:49:02 +0200 (CEST) Received: (qmail 47548 invoked by uid 500); 28 Jun 2018 07:49:01 -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 47537 invoked by uid 99); 28 Jun 2018 07:49:00 -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 07:49:00 +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 33A03180453 for ; Thu, 28 Jun 2018 07:49:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-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=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd3-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com 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 GvOdWfGg4OlC for ; Thu, 28 Jun 2018 07:48:58 +0000 (UTC) Received: from mail-ua0-f169.google.com (mail-ua0-f169.google.com [209.85.217.169]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTPS id 200735F295 for ; Thu, 28 Jun 2018 07:48:58 +0000 (UTC) Received: by mail-ua0-f169.google.com with SMTP id z12-v6so2835666uac.8 for ; Thu, 28 Jun 2018 00:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=WwG/thmI7x6YWnfJ23pwl14L/UdnXqcHqViA+6KEgik=; b=WQgLd4uLq99jqlbra+OBDvDsroFGxBm7OKh/w1V7qj9ieJQz+qpx79RtrNSmGgnPgE x7cFn13QskWRlYyqypeUOJoylH71bYrXJA44dtQhbdO5fqo5eNB+IAfL/fKFz9FtHVD0 pBDHulxPhPwRqnEj2WbFoXyk3ViH2Yk3GBTsjvkFoP/mhqrmiuR8XHwfo++N5JeoaL/X GhGwlFpXVyFH472iVxSFcSlpkSiB6Hc1aZYeBjqeBK2qZQ70Ihd/6E9D8f3OvHto2kjG 5UO589Jd9cEI+eIlZKgW1dc3SJkJwK78fhF4NslzWmeVQt4Jg4W/KRD78ZeUBghJLHFJ ZsRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=WwG/thmI7x6YWnfJ23pwl14L/UdnXqcHqViA+6KEgik=; b=dLpGrVs/0ZuKAQvLIt/iOrW4FFVXZVYKq5ny9oAStP+QoikHbKF9CxB8tXITfPCYQ4 Y6nuvfbOzt0deoOX2sEDfyLdziZLdVYVsueWDusqAft2ZQ0rZAOuFnLAxnY/AHODtLB5 pU4ndHmsGmnnOpzz1LXg5TKZ94x0wZRBR7ZPekhYqpqac49My7SQrQz96/FtZ83PLTMJ RGRdWenG1VmJ5RqXNY/UcPSYpm5mlzDthTT+7CxyOSEf4DxyhWmyWeAfOo/pxjmRLXW7 hbMVnc9IB35QpAkEpaNEKryE1O5/KF+oNgmd4A5idLRl3fVWilkpWENVnBxa/N9hUB69 CrQA== X-Gm-Message-State: APt69E0HrKpsC/CnRA4DQlUx/VpxjP/QJoTZT4IT7Enr0r6KhUWeBk5S yD95CIELssNZ416RdhRyBx1trXNFM2MQ2gvyYLU= X-Google-Smtp-Source: AAOMgpf3ALl6/vLIfG5g6m0kjsDkR5g7LdfiyvKZZQJ3hY5ib2Ss+6j13XnE1X7CqUmNkfJ9x/Iumt1E1nI70S5f358= X-Received: by 2002:ab0:486e:: with SMTP id c43-v6mr5879610uad.157.1530172131029; Thu, 28 Jun 2018 00:48:51 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a67:2401:0:0:0:0:0 with HTTP; Thu, 28 Jun 2018 00:48:30 -0700 (PDT) In-Reply-To: <431EBEF6-3B1E-4886-84D6-1380BB5EF5C8@juniper.net> References: <431EBEF6-3B1E-4886-84D6-1380BB5EF5C8@juniper.net> From: Johan Corveleyn Date: Thu, 28 Jun 2018 09:48:30 +0200 Message-ID: Subject: Re: SVN patch issue with property changes To: Dipu H Cc: "users@subversion.apache.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jun 27, 2018 at 1:07 PM, Dipu H wrote: > Hi Team, > > I have a patch with svn property changes as below: > > dipuh@contrail-ubm-MADHUS:/tmp/tests$ svn diff xpathleak.py > Index: xpathleak.py > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- xpathleak.py (revision 950359) > +++ xpathleak.py (working copy) > @@ -4,25 +4,15 @@ > libxml2.debugMemory(True) > > expect=3D"""--> Invalid expression > ---> xmlXPathEval: evaluation failed > --> Invalid expression > ---> xmlXPathEval: evaluation failed > """ > err=3D"" > def callback(ctx, str): > > Property changes on: xpathleak.py > ___________________________________________________________________ > Modified: svn:executable > ## -0,0 +1 ## > +* <<<<<<<------------- Yes, there is a change, value * added to property > svn:executable > \ No newline at end of property > Added: svn:mime-type > ## -0,0 +1 ## > +text/plain > \ No newline at end of property > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D > > Now I generated the patch and applied it on another copy of the same bran= ch. > > dipuh@contrail-ubm-MADHUS:/tmp/tests$ svn diff xpathleak.py >/tmp/mypatch > > dipuh@contrail-ubm-MADHUS:/tmp/apply$ svn patch /tmp/mypatch > UC xpathleak.py >> rejected hunk ## -0,0 +1,1 ## (svn:executable) > Summary of conflicts: > Property conflicts: 1 > > The patch is rejected without changing the property. The destination file > already has svn:executable property present in it. But the value is empty= . > Ideally, if the patch was applied properly, the value should have been > changed to "*". > > > After little bit of googling, I found the below link which looks like a > similar issue. > > https://jira.atlassian.com/browse/CRUC-6114?src=3Dconfmacro > > SVN Version : 1.8.11 > > > > I understand that the latest svn clients add * as the value of > svn:executable property. However, if we generate a patch out of this and > apply on an existing file, `svn patch` is not able to identify that there= is > a property change from =E2=80=98null=E2=80=99 to =E2=80=98*=E2=80=99. Cou= ld you please check if this is a > bug? SVN 1.8.11 is very old (version 1.8.x is actually end-of-life now [1]). Can you test with a 1.10 client to see if it shows the same behaviour? [1] http://subversion.apache.org/docs/release-notes/1.10.html#svn-1.8-depre= cation --=20 Johan