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

Re: svn commit: rev 4916

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2003-02-18 05:33:35 CET

mbk@tigris.org writes:
> Log:
> This change completes the UUID implementation: a new RA vtable method,
> "get_uuid" is added, and implemented for ra_dav, ra_local, and ra_svn.

Bravo!

Might want to mention issue #1037 in the commit message.

> --- trunk/subversion/include/svn_ra.h (original)
> +++ trunk/subversion/include/svn_ra.h Mon Feb 17 21:05:28 2003
> @@ -787,6 +787,12 @@
> const char *path,
> svn_revnum_t revision);
>
> + /** Set @a *uuid to the repository's UUID.
> + *
> + * Set @a *uuid to the repository's UUID.
> + */
> + svn_error_t *(*get_uuid) (void *session_baton,
> + const char **uuid);
>
> } svn_ra_plugin_t;

Should probably mention that *uuid has the same lifetime as the
session_baton.

> Modified: trunk/subversion/libsvn_repos/delta.c
> ==============================================================================
> --- trunk/subversion/libsvn_repos/delta.c (original)
> +++ trunk/subversion/libsvn_repos/delta.c Mon Feb 17 21:05:31 2003
> @@ -468,6 +468,7 @@
> if (SVN_IS_VALID_REVNUM (committed_rev))
> {
> svn_fs_t *fs = svn_fs_root_fs (c->target_root);
> + const char *uuid;
>
> /* Transmit the committed-rev. */
> cr_str = svn_string_createf (subpool, "%" SVN_REVNUM_T_FMT,
> @@ -486,6 +487,18 @@
> SVN_PROP_REVISION_AUTHOR, subpool);
> SVN_ERR (change_fn (c, object, SVN_PROP_ENTRY_LAST_AUTHOR,
> last_author, subpool));
> +
> + /* Transmit the last-author. */
> + svn_fs_revision_prop (&last_author, fs, committed_rev,
> + SVN_PROP_REVISION_AUTHOR, subpool);
> + SVN_ERR (change_fn (c, object, SVN_PROP_ENTRY_UUID,
> + last_author, subpool));
> +
> + /* Transmit the UUID. */
> + svn_fs_get_uuid (fs, &uuid, subpool);
> + SVN_ERR (change_fn (c, object, SVN_PROP_ENTRY_UUID,
> + svn_string_create(uuid, subpool),
> + subpool));
> }
> }

Looks like you accidentally pasted in the author block twice -- in the
code, it's now like this:

          /* Transmit the last-author. */
          svn_fs_revision_prop (&last_author, fs, committed_rev,
                                SVN_PROP_REVISION_AUTHOR, subpool);
          SVN_ERR (change_fn (c, object, SVN_PROP_ENTRY_LAST_AUTHOR,
                              last_author, subpool));

          /* Transmit the last-author. */
          svn_fs_revision_prop (&last_author, fs, committed_rev,
                                SVN_PROP_REVISION_AUTHOR, subpool);
          SVN_ERR (change_fn (c, object, SVN_PROP_ENTRY_UUID,
                              last_author, subpool));

          /* Transmit the UUID. */
          svn_fs_get_uuid (fs, &uuid, subpool);
          SVN_ERR (change_fn (c, object, SVN_PROP_ENTRY_UUID,
                              svn_string_create(uuid, subpool),
                              subpool));

Probably didn't mean to do that :-)...

Oh, wait -- this was a merge, right? So the question is, is this an
incorrect merge result, or did merge do the right thing with the data
it had? (Can you look into it?)

Everything else looks great!

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 18 06:06:32 2003

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