Re: Issue #4476 - Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-12-17 Thread Julian Foad
Branko Čibej wrote: > On 17.12.2014 17:13, Julian Foad wrote: >>   * 'svnadmin load' always rewrites mergeinfo, which can change its form >> even if it doesn't need to change it semantically. (Except, since >> r1643074, if it's unparsable, it loads it unchanged instead of bombing >> out.) >> >>

Re: Issue #4476 - Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-12-17 Thread Branko Čibej
On 17.12.2014 17:13, Julian Foad wrote: > Branko Čibej wrote: >> On 17.12.2014 15:52, Julian Foad wrote: >>> In http://svn.apache.org/r1646250 I committed a version that also works by >>> textual substitution, but (hopefully) without the above-mentioned issues. >>> This >>> makes svnsync remove

Re: Issue #4476 - Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-12-17 Thread Julian Foad
Branko Čibej wrote: > On 17.12.2014 15:52, Julian Foad wrote: >> In http://svn.apache.org/r1646250 I committed a version that also works by >> textual substitution, but (hopefully) without the above-mentioned issues. >> This >> makes svnsync remove r0 references before trying to commit. > > Doe

Re: Issue #4476 - Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-12-17 Thread Branko Čibej
On 17.12.2014 15:52, Julian Foad wrote: > I (Julian Foad) wrote on 4th December: >> Julian Foad wrote: >>> ... 'svnsync' ... my current thought is it >>> should 'correct' the mergeinfo by removing the r0 reference. >> I have written a test for this, and hacked up code to do this by textual >> s

Re: Issue #4476 - Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-12-17 Thread Julian Foad
I (Julian Foad) wrote on 4th December: > Julian Foad wrote: >> ... 'svnsync' ... my current thought is it >>  should 'correct' the mergeinfo by removing the r0 reference. > > I have written a test for this, and hacked up code to do this by textual > substitution. It isn't quite right -- for exam

Re: Issue #4476 - Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-12-04 Thread Julian Foad
the regular parser. Here's the patch in progress... - Julian Fix the 'svnsync' part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin dump fail". Make 'svnsync' adjust mergeinfo containing r0 to remove the r0 before trying to commit it to the targ

Re: Issue #4476 - Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-12-04 Thread Branko Čibej
On 04.12.2014 19:40, Julian Foad wrote: > I (Julian Foad) wrote: > >>> I'll come to 'svnsync' later, but basically my current thought is it >>> should 'correct' the mergeinfo by removing the r0 reference. >> I have written a test for this, and hacked up code to do this by textual >> substitutio

Re: Issue #4476 - Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-12-04 Thread Julian Foad
I (Julian Foad) wrote: >> I'll come to 'svnsync' later, but basically my current thought is it >> should 'correct' the mergeinfo by removing the r0 reference. > > I have written a test for this, and hacked up code to do this by textual > substitution. It isn't quite right -- for example it wo

Re: Issue #4476 - Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-12-04 Thread Julian Foad
Julian Foad wrote: > http://subversion.tigris.org/issues/show_bug.cgi?id=4476 [...] > PROPOSAL > > In the presence of a mergeinfo property that refers to r0, at the > libsvn_repos > API: > > 'dump' >   shall dump the property verbatim (with nowarning). (Done.) > > 'load', with 'validate proper

Issue #4476 - Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-12-02 Thread Julian Foad
http://subversion.tigris.org/issues/show_bug.cgi?id=4476 There's another part to this issue: 'svnadmin load'. When mergeinfo refers to r0, not only does 'svnadmin dump' fail (fixed in r1574868) and 'svnsync' fail, but 'svnadmin load' also fails, as I found when I started writing a test for the

Re: Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-03-06 Thread Julian Foad
I filed issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin dump fail" <http://subversion.tigris.org/issues/show_bug.cgi?id=4476>. One relatively easy part to fix is 'svnadmin dump'. A dump should not fail just because it is trying to parse the dat

Re: Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-03-03 Thread Branko Čibej
On 03.03.2014 17:24, Julian Foad wrote: > * Make 'svnsync sync' strip out the revision 0 from that mergeinfo? Or make > it strip out the whole mergeinfo property if it fails to parse? Or just that > line of the property value? (If we do something like that, I'd like us to do > it everywhere we

Mergeinfo containing r0 makes svnsync and svnadmin dump fail

2014-03-03 Thread Julian Foad
A customer found that 'svnsync' errored out on trying to sync a revision in which the source repository introduced some mergeinfo starting with r0, similar to this example:   $ svn propget svn:mergeinfo ^/foo@1234567   /bar:0-100,111,122 The svnsync error message was:   $ svnsync s