[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r25231 - trunk/subversion/libsvn_fs_util

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-05-31 19:55:17 CEST

On Thu, 31 May 2007, hwright@tigris.org wrote:
...
> When searching for child mergeinfo, look for proper children of the given path,
> not just paths with a common prefix. Followup to r25138.
...
> * subversion/libsvn_fs_util/mergeinfo-sqlite-index.c
> (get_mergeinfo_for_children): Select only paths which are proper children of
> the requested path.
...
> --- trunk/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c (original)
> +++ trunk/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c Thu May 31 07:50:12 2007
> @@ -619,7 +619,7 @@
> "WHERE path LIKE ? AND revision <= ?;",
> -1, &stmt, NULL), db);
>
> - like_path = apr_psprintf(pool, "%s%%", path);
> + like_path = apr_psprintf(pool, "%s/%%", path);
>
> SQLITE_ERR(sqlite3_bind_text(stmt, 1, like_path, -1, SQLITE_TRANSIENT), db);
> SQLITE_ERR(sqlite3_bind_int64(stmt, 2, rev), db);
...

Looks good, Hyrum. Is our test case exercising this yet? (I think it
should, to prevent regression.)

  • application/pgp-signature attachment: stored
Received on Thu May 31 19:56:23 2007

This is an archived mail posted to the Subversion Dev mailing list.