Re: svndumpfilter matches by node path string containment rather than by node path directory containment

Matthew Carter wrote on Fri, 20 Jun 2008 at 00:19 -0400:
> When I ask svndumpfilter to remove just the "Foo" node, both the "Foo" and the
> "FooBar.txt" nodes are removed.
>

That's bad.

> Do you agree that this is a problem? Shall I file an issue for this in the
> subversion issue tracker?
>

Does this (completely untested) patch fix the problem?

Index: subversion/svndumpfilter/main.c
===================================================================
--- subversion/svndumpfilter/main.c (revision 31823)
+++ subversion/svndumpfilter/main.c (working copy)
@@ -115,7 +115,8 @@ ary_prefix_match(apr_array_header_t *pfxlist, cons
       pfx_len = strlen(pfx);
       if (path_len < pfx_len)
         continue;
- if (strncmp(path, pfx, pfx_len) == 0)
+ if (strncmp(path, pfx, pfx_len) == 0
+ && (path[pfx_len] == '\0' || path[pfx_len] == '/'))
         return TRUE;
     }

> Thank you.
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-20 19:49:18 CEST