Hi Johan,
Thanks for getting back. I tried to patch with svn 1.9 and 1.10. Still the same error.
root_at_contrail-ubm-dipuh:/tmp/tests# svn --version -q
1.10.0
root_at_contrail-ubm-dipuh:/tmp/tests# svn patch /tmp/patch
C xpathleak.py
> rejected hunk ## -0,0 +1,1 ## (svn:executable)
Summary of conflicts:
Property conflicts: 1
root_at_contrail-ubm-dipuh:/tmp/tests# cat /tmp/patch
Index: xpathleak.py
===================================================================
--- xpathleak.py (revision 951471)
+++ xpathleak.py (working copy)
Property changes on: xpathleak.py
___________________________________________________________________
Modified: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
root_at_contrail-ubm-dipuh:/tmp/tests#
Looks like svn is not able to properly handle the svn:executable property changes via patch.
Thanks,
On 6/28/18, 1:18 PM, "Johan Corveleyn" <jcorvel_at_gmail.com> wrote:
On Wed, Jun 27, 2018 at 1:07 PM, Dipu H <dipuh_at_juniper.net> wrote:
> Hi Team,
>
> I have a patch with svn property changes as below:
>
> dipuh_at_contrail-ubm-MADHUS:/tmp/tests$ svn diff xpathleak.py
> Index: xpathleak.py
> ===================================================================
> --- xpathleak.py (revision 950359)
> +++ xpathleak.py (working copy)
> @@ -4,25 +4,15 @@
> libxml2.debugMemory(True)
>
> expect="""--> Invalid expression
> ---> xmlXPathEval: evaluation failed
> --> Invalid expression
> ---> xmlXPathEval: evaluation failed
> """
> err=""
> 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
>
> ================================
>
> Now I generated the patch and applied it on another copy of the same branch.
>
> dipuh_at_contrail-ubm-MADHUS:/tmp/tests$ svn diff xpathleak.py >/tmp/mypatch
>
> dipuh_at_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://urldefense.proofpoint.com/v2/url?u=https-3A__jira.atlassian.com_browse_CRUC-2D6114-3Fsrc-3Dconfmacro&d=DwIFaQ&c=HAkYuh63rsuhr6Scbfh0UjBXeMK-ndb3voDTXcWzoCI&r=R5PFHc5rDhpXLKW9uD5GLI0W5asiYkw8WhxwHr2VyEY&m=2Csq4fBQTlRsi0n-Yy6XoE4sy-DbLVwSjkHoUJTGnGc&s=GOnZyVv3lNp9RPBWISwcxT6lg-OydhkL7p29RsFJcDo&e=
>
> 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 ‘null’ to ‘*’. Could 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] https://urldefense.proofpoint.com/v2/url?u=http-3A__subversion.apache.org_docs_release-2Dnotes_1.10.html-23svn-2D1.8-2Ddeprecation&d=DwIFaQ&c=HAkYuh63rsuhr6Scbfh0UjBXeMK-ndb3voDTXcWzoCI&r=R5PFHc5rDhpXLKW9uD5GLI0W5asiYkw8WhxwHr2VyEY&m=2Csq4fBQTlRsi0n-Yy6XoE4sy-DbLVwSjkHoUJTGnGc&s=1HQYS3C3zQt48pqpi3F0MrOObkTvG9TllltanmlCLTs&e=
--
Johan
Received on 2018-06-28 16:25:30 CEST