Re: SVN patch issue with property changes

2018-06-28 Thread Philip Martin
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

Re: Unable to shelve changes when using custom diff-cmd

2018-06-28 Thread Julian Foad
> Csongor Pal writes: >> When running an svn shelve command I get the diffs opened up in >> FileMerge and the command fails with: svn: E29: No changes were >> shelved > [...] >> I'm using svn, version 1.10.0 (r1827917) on macOS 10.13. Philip Martin wrote: > [...] The long term fix for 1.10

Re: SVN patch issue with property changes

2018-06-28 Thread Julian Foad
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 > > I'

Re: Perforce to Subversion

2018-06-28 Thread trent . fisher
On 06/14/2018 10:24 AM, Brady Cottam wrote: Can anyone tell me if you can import data from Perforce into Subversion with any ease? Thanks Brady Yes, the converter at http://p42svn.tigris.org/ does a good job. I'm not sure any conversion of any significance can ever be done "with ease", but

Re: SVN patch issue with property changes

2018-06-28 Thread Philip Martin
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 '' spe

Re: SVN patch issue with property changes

2018-06-28 Thread Julian Foad
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

Re: SVN patch issue with property changes

2018-06-28 Thread Julian Foad
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 with

Re: SVN patch issue with property changes

2018-06-28 Thread Dipu H
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# sv

Re: SVN patch issue with property changes

2018-06-28 Thread Philip Martin
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

Re: SVN patch issue with property changes

2018-06-28 Thread Dipu H
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. root@contrail-ubm-dipuh:/tmp/tests

Re: SVN patch issue with property changes

2018-06-28 Thread Daniel Shahaf
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

Re: SVN patch issue with property changes

2018-06-28 Thread Dipu H
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) Su

Re: SVN patch issue with property changes

2018-06-28 Thread Johan Corveleyn
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