Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo

subversion
Discussion topic

Back to topic list

Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo

Author bpsm
Full name B. Smith-Mannschott
Date 2009-05-10 22:31:18 PDT
Message > On May 8, 2009 3:23 PM, "John Skopis" <jskopis@backstop​solutions.com> wrote:
>
> Hello,
>
> svnadmin load fails while importing a dump that contains a windows newline
> in svn:mergeinfo prop. I have not done extensive testing on this patch, but
> it should work (in that it doesn't segfault when I attempt to import a
> revision with \r\n in mergeinfo). Be advised I am not actually a developer.
>
> Thanks,
> John Skopis
> Systems Administration
>
>
> [[[
> * subversion/libsvn_su​br/mergeinfo.c
> (parse_revlist): Ignore windows newlines in svn:mergeinfo
> ]]]
>
> Index: subversion/libsvn_su​br/mergeinfo.c
> ====================​====================​====================​=======
> --- subversion/libsvn_su​br/mergeinfo.c (revision 37647)
> +++ subversion/libsvn_su​br/mergeinfo.c (working copy)
> @@ -402,7 +403,7 @@
> svn_revnum_t firstrev;
>
> SVN_ERR(svn_revnum_p​arse(&firstrev, curr, &curr));
> - if (*curr != '-' && *curr != '\n' && *curr != ',' && *curr != '*'
> + if (*curr != '-' && *curr != '\n' && *curr != ',' && *curr != '*' &&
> *curr != '\r'
> && curr != end)
> return svn_error_createf(SV​N_ERR_MERGEINFO_PARS​E_ERROR, NULL,
> _("Invalid character '%c' found in revision
> "
> @@ -430,8 +431,10 @@
> mrange->end = secondrev;
> }
>
> - if (*curr == '\n' || curr == end)
> + if (*curr == '\r' || *curr == '\n' || curr == end)
> {
> + if ( *curr == '\r' )
> + curr++;
> APR_ARRAY_PUSH(revlist, svn_merge_range_t *) = mrange;
> *input = curr;
> return SVN_NO_ERROR;
> @@ -445,10 +448,10 @@
> {
> mrange->inheritable = FALSE;
> curr++;
> - if (*curr == ',' || *curr == '\n' || curr == end)
> + if (*curr == ',' || *curr == '\n' || *curr == '\r' || curr == end
> )
> {
> APR_ARRAY_PUSH(revlist, svn_merge_range_t *) = mrange;
> - if (*curr == ',')
> + if (*curr == ',' || *curr == '\r' )
> {
> curr++;
> }
>

On Sun, May 10, 2009 at 22:32, David Glasser <glasser@davidgla​sser.net> wrote:
> Why is there a windows newline in your dump file? Svn dumps are binary
> files, not text.
>
> Now, maybe the svn:mergeinfo property in general should allow windows
> newlines (which is what your patch does), but why?

No, I don't believe that svn:mergeinfo should allow windows newlines.
In fact, the fixes for issues 1796 and 3313 conspired to make
Subversion 1.6 very particular about the newline cleanliness of its
internal (i.e. svn:*) properties.

http://subversion.ti​gris.org/issues/show​_bug.cgi?id=1796
http://subversion.ti​gris.org/issues/show​_bug.cgi?id=3313

This new-found strictness lead to issue 3404 (svnload fails on ^M),
for which there is an as yet unreviewed patch linked to from the
issue.

http://subversion.ti​gris.org/issues/show​_bug.cgi?id=3404

In any event, it appears that Subversion deliberately uses only \n
internally. some other parts of the code may well depend on this. I
don't think it would be advisable to relax the requirements, as above,
without first investigating this.

// Ben

« Previous message in topic | 3 of 16 | Next message in topic »

Messages

Show all messages in topic

[PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo John Skopis <jskopis at backstopsolutions dot com> John Skopis <jskopis at backstopsolutions dot com> 2009-05-08 13:34:43 PDT
     Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo glasser David Glasser 2009-05-10 13:33:00 PDT
         Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo bpsm B. Smith-Mannschott 2009-05-10 22:31:18 PDT
             Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo bpsm B. Smith-Mannschott 2009-05-11 01:24:32 PDT
             Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo Daniel Shahaf <d dot s at daniel dot shahaf dot name> Daniel Shahaf <d dot s at daniel dot shahaf dot name> 2009-05-11 07:52:11 PDT
                 Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo Paul Burba <ptburba at gmail dot com> Paul Burba <ptburba at gmail dot com> 2009-05-11 08:49:12 PDT
                     RE: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo John Skopis <jskopis at backstopsolutions dot com> John Skopis <jskopis at backstopsolutions dot com> 2009-05-11 08:54:19 PDT
                         RE: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo Daniel Shahaf <d dot s at daniel dot shahaf dot name> Daniel Shahaf <d dot s at daniel dot shahaf dot name> 2009-05-11 09:38:31 PDT
                 RE: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo John Skopis <jskopis at backstopsolutions dot com> John Skopis <jskopis at backstopsolutions dot com> 2009-05-11 08:52:39 PDT
                     RE: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo Daniel Shahaf <d dot s at daniel dot shahaf dot name> Daniel Shahaf <d dot s at daniel dot shahaf dot name> 2009-05-11 09:49:33 PDT
                         Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo glasser David Glasser 2009-05-11 10:36:20 PDT
                             Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo Paul Burba <ptburba at gmail dot com> Paul Burba <ptburba at gmail dot com> 2009-05-11 14:01:16 PDT
                                 Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo markphip Mark Phippard 2009-05-11 15:21:12 PDT
                                     Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo Paul Burba <ptburba at gmail dot com> Paul Burba <ptburba at gmail dot com> 2009-05-12 09:37:54 PDT
                                         Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo Daniel Shahaf <d dot s at daniel dot shahaf dot name> Daniel Shahaf <d dot s at daniel dot shahaf dot name> 2009-05-12 09:53:35 PDT
     Re: [PATCH] svnadmin load will not import dump with windows newline character in svn:mergeinfo John Skopis <jskopis at backstopsolutions dot com> John Skopis <jskopis at backstopsolutions dot com> 2009-05-11 15:32:28 PDT
Messages per page: