Dipu H wrote on Thu, Jun 28, 2018 at 15:23:35 +:
> It is a conflict. Values didn’t change after applying the patch.
>
> root@contrail-ubm-dipuh:/tmp/tests# svn patch /tmp/patch
> Cxpathleak.py
> > rejected hunk ## -0,0 +1,1 ## (svn:executable)
> Summary of conflicts:
>
Philip Martin wrote on Thu, Jun 28, 2018 at 16:19:30 +0100:
> The normalization of svn:executable values is implemented in the client.
> If some client chooses not to implement that normalization the backend
> will store any value given.
>
> Should the svn client silently merge '' and '*' for
On 29.06.2018 10:45, Johan Corveleyn wrote:
> On Fri, Jun 29, 2018 at 10:34 AM, Branko Čibej wrote:
>> On 28.06.2018 22:08, Julian Foad wrote:
>>> Philip Martin wrote:
Julian Foad writes:
> Julian Foad wrote:
>> The bug seems to be that 'svn patch' fails to apply any patch of
>>
On Fri, Jun 29, 2018 at 10:34 AM, Branko Čibej wrote:
> On 28.06.2018 22:08, Julian Foad wrote:
>> Philip Martin wrote:
>>> Julian Foad writes:
Julian Foad wrote:
> The bug seems to be that 'svn patch' fails to apply any patch of
> this form, that tries to change a property value
On 28.06.2018 22:08, Julian Foad wrote:
> Philip Martin wrote:
>> Julian Foad writes:
>>> Julian Foad wrote:
The bug seems to be that 'svn patch' fails to apply any patch of
this form, that tries to change a property value from empty to
non-empty.
>>> I committed a test for this
Julian Foad writes:
> The issue is about a patch that *changes* the current value to another
> value, not a patch that *adds* a property.
Yes, sorry. I misinterprted the patches.
--
Philip
Philip Martin wrote:
> Julian Foad writes:
> > Julian Foad wrote:
> >> The bug seems to be that 'svn patch' fails to apply any patch of
> >> this form, that tries to change a property value from empty to
> >> non-empty.
> >
> > I committed a test for this in http://svn.apache.org/r1834628
>
>
Julian Foad writes:
> Julian Foad wrote:
>> The bug seems to be that 'svn patch' fails to apply any patch of
>> this form, that tries to change a property value from empty to
>> non-empty.
>
> I committed a test for this in http://svn.apache.org/r1834628
I'm confused, you are treating as ''
Julian Foad wrote:
> The bug seems to be that 'svn patch' fails to apply any patch of this form,
> that tries to change a property value from empty to non-empty.
I committed a test for this in http://svn.apache.org/r1834628
- Julian
Dipu H wrote:
> Property changes on: xpathleak.py
> ___
> Modified: svn:executable
> ## -0,0 +1 ##
> +* <<<- Yes, there is a change, value * added...
> \ No newline at end of property
[...]
> The patch is rejected
Hi Philip,
It is a conflict. Values didn’t change after applying the patch.
root@contrail-ubm-dipuh:/tmp/tests# svn patch /tmp/patch
Cxpathleak.py
> rejected hunk ## -0,0 +1,1 ## (svn:executable)
Summary of conflicts:
Property conflicts: 1
root@contrail-ubm-dipuh:/tmp/tests#
Daniel Shahaf writes:
> 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.
The normalization of svn:executable
Hi Daniel,
Thanks for the update. Yes, I have many files in the repository with
"svn:executable" value set to "null". This is a very old repository, may be
created using a very older version of svn. Older clients might have added the
property without a value.
Dipu H wrote on Thu, 28 Jun 2018 14:24 +:
> 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
Hi Johan,
Thanks for getting back. I tried to patch with svn 1.9 and 1.10. Still the same
error.
root@contrail-ubm-dipuh:/tmp/tests# svn --version -q
1.10.0
root@contrail-ubm-dipuh:/tmp/tests# svn patch /tmp/patch
Cxpathleak.py
> rejected hunk ## -0,0 +1,1 ## (svn:executable)
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
> ===
> --- xpathleak.py (revision
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
===
--- xpathleak.py (revision 950359)
+++ xpathleak.py (working copy)
@@ -4,25 +4,15 @@
17 matches
Mail list logo
