You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Karl Fogel <kf...@newton.ch.collab.net> on 2003/02/18 04:33:35 UTC
Re: svn commit: rev 4916
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
Re: svn commit: rev 4916
Posted by Branko Čibej <br...@xbc.nu>.
Karl Fogel wrote:
>>--- 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);
>>
>>
By the way, everybody should just stop repeating the brief docstring. I
changed the doxygen config file to repeat the brief description in the
long one. So, if you do have a long description, make it continue
naturally from the first sentence (which is the brief description).
--
Brane Čibej <br...@xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 4916
Posted by Daniel Rall <dl...@finemaltcoding.com>.
Philip Martin <ph...@codematters.co.uk> writes:
> Daniel Rall <dl...@finemaltcoding.com> writes:
>
> > Karl Fogel <kf...@newton.ch.collab.net> writes:
> >
> > > mark benedetto king <mb...@boredom.org> writes:
> > > > Tweaking. Actually, can't tweak:
> > > >
> > > > $ svn propedit svn:log --revprop -r 4916
> > > > <do some tweaking, then exit the editor>
> > > > subversion/libsvn_ra_dav/util.c:81: (apr_err=175002)
> > > > svn: RA layer request failed
> > > > svn: applying property change to /repos/svn/!svn/bln/4916: 400 Bad Request
> > > >
> > > > Any idea why?
> > >
> > > Hmmm. This is ringing a bell, but I can't remember where we've seen
> > > this before. Anyone recognize it? It looks like it's getting this
> > > error in the server's error_log:
> > >
> > > [Mon Feb 17 23:33:35 2003] [error] [client 65.42.80.147] \
> > > An undefined namespace prefix was used.
> >
> > Huh. I'm guessing that this error message is the result of a XML
> > problem, where the prefix alias "X:" was used without being defined by
> > the enclosing XML snippet. An ethereal trace would be most useful for
> > confirming.
>
> The log message contains "<" and ">" characters -- these characters
> don't work with "propset --revprop" over ra_dav.
Ah, that could certainly screw up the XML parser if the ra_dav
libraries don't XML entity encode the log message.
--
Daniel Rall <dl...@finemaltcoding.com>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 4916
Posted by Philip Martin <ph...@codematters.co.uk>.
Daniel Rall <dl...@finemaltcoding.com> writes:
> Karl Fogel <kf...@newton.ch.collab.net> writes:
>
> > mark benedetto king <mb...@boredom.org> writes:
> > > Tweaking. Actually, can't tweak:
> > >
> > > $ svn propedit svn:log --revprop -r 4916
> > > <do some tweaking, then exit the editor>
> > > subversion/libsvn_ra_dav/util.c:81: (apr_err=175002)
> > > svn: RA layer request failed
> > > svn: applying property change to /repos/svn/!svn/bln/4916: 400 Bad Request
> > >
> > > Any idea why?
> >
> > Hmmm. This is ringing a bell, but I can't remember where we've seen
> > this before. Anyone recognize it? It looks like it's getting this
> > error in the server's error_log:
> >
> > [Mon Feb 17 23:33:35 2003] [error] [client 65.42.80.147] \
> > An undefined namespace prefix was used.
>
> Huh. I'm guessing that this error message is the result of a XML
> problem, where the prefix alias "X:" was used without being defined by
> the enclosing XML snippet. An ethereal trace would be most useful for
> confirming.
The log message contains "<" and ">" characters -- these characters
don't work with "propset --revprop" over ra_dav.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 4916
Posted by mark benedetto king <mb...@boredom.org>.
On Tue, Feb 18, 2003 at 09:52:35PM -0800, Greg Stein wrote:
> On Tue, Feb 18, 2003 at 09:47:33AM -0600, Karl Fogel wrote:
> > Daniel Rall <dl...@finemaltcoding.com> writes:
> > > Huh. I'm guessing that this error message is the result of a XML
> > > problem, where the prefix alias "X:" was used without being defined by
> > > the enclosing XML snippet. An ethereal trace would be most useful for
> > > confirming.
> >
> > We looked at a trace, didn't see the prefix "X:" (or anything else out
> > of the ordinary). I don't still have that trace, unfortunately; but
> > whatever the server-side problem was, it appears to have been fixed.
>
> A magical fix? That isn't very encouraging :-)
>
I can, at least, confirm that the magic works for me.
--ben
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 4916
Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Greg Stein <gs...@lyra.org> writes:
> A magical fix? That isn't very encouraging :-)
No -- but after searching through the logs for a while, we couldn't
see an obvious change which would have fixed it.
> I don't think Dan meant "X:" literatlly, but that a prefix was used which
> wasn't defined. The question is "which one?" It sounds like whatever mbk is
> using is generating a bad request. What rev? And why is it bad? Why would
> svn.collab.net reject it, but a new server accept it?
In an ideal world, I'd like to know the answer to those questions :-).
But are they really worth chasing down when we have so much else to
work on? My feeling is, if the problem comes back, then we hunt.
Otherwise, move on.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 4916
Posted by Greg Stein <gs...@lyra.org>.
On Tue, Feb 18, 2003 at 09:47:33AM -0600, Karl Fogel wrote:
> Daniel Rall <dl...@finemaltcoding.com> writes:
> > Huh. I'm guessing that this error message is the result of a XML
> > problem, where the prefix alias "X:" was used without being defined by
> > the enclosing XML snippet. An ethereal trace would be most useful for
> > confirming.
>
> We looked at a trace, didn't see the prefix "X:" (or anything else out
> of the ordinary). I don't still have that trace, unfortunately; but
> whatever the server-side problem was, it appears to have been fixed.
A magical fix? That isn't very encouraging :-)
I don't think Dan meant "X:" literatlly, but that a prefix was used which
wasn't defined. The question is "which one?" It sounds like whatever mbk is
using is generating a bad request. What rev? And why is it bad? Why would
svn.collab.net reject it, but a new server accept it?
I'm all right with new clients not being able to do a --revprop to old
servers (fringe functionality), but it doesn't feel "cozy" ...
Cheers,
-g
--
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 4916
Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Daniel Rall <dl...@finemaltcoding.com> writes:
> Huh. I'm guessing that this error message is the result of a XML
> problem, where the prefix alias "X:" was used without being defined by
> the enclosing XML snippet. An ethereal trace would be most useful for
> confirming.
We looked at a trace, didn't see the prefix "X:" (or anything else out
of the ordinary). I don't still have that trace, unfortunately; but
whatever the server-side problem was, it appears to have been fixed.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 4916
Posted by Daniel Rall <dl...@finemaltcoding.com>.
Karl Fogel <kf...@newton.ch.collab.net> writes:
> mark benedetto king <mb...@boredom.org> writes:
> > Tweaking. Actually, can't tweak:
> >
> > $ svn propedit svn:log --revprop -r 4916
> > <do some tweaking, then exit the editor>
> > subversion/libsvn_ra_dav/util.c:81: (apr_err=175002)
> > svn: RA layer request failed
> > svn: applying property change to /repos/svn/!svn/bln/4916: 400 Bad Request
> >
> > Any idea why?
>
> Hmmm. This is ringing a bell, but I can't remember where we've seen
> this before. Anyone recognize it? It looks like it's getting this
> error in the server's error_log:
>
> [Mon Feb 17 23:33:35 2003] [error] [client 65.42.80.147] \
> An undefined namespace prefix was used.
Huh. I'm guessing that this error message is the result of a XML
problem, where the prefix alias "X:" was used without being defined by
the enclosing XML snippet. An ethereal trace would be most useful for
confirming.
--
Daniel Rall <dl...@finemaltcoding.com>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 4916
Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Karl Fogel <kf...@newton.ch.collab.net> writes:
> > $ svn propedit svn:log --revprop -r 4916
> > <do some tweaking, then exit the editor>
> > subversion/libsvn_ra_dav/util.c:81: (apr_err=175002)
> > svn: RA layer request failed
> > svn: applying property change to /repos/svn/!svn/bln/4916: 400 Bad Request
> >
> > Any idea why?
>
> Hmmm. This is ringing a bell, but I can't remember where we've seen
> this before. Anyone recognize it? It looks like it's getting this
> error in the server's error_log:
>
> [Mon Feb 17 23:33:35 2003] [error] [client 65.42.80.147] \
> An undefined namespace prefix was used.
By the way, Mike Pilato and I just confirmed that this bug is not
present in head, so once we upgrade svn.collab.net there shouldn't be
a problem (and we are upgrading with 0.18).
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 4916
Posted by Karl Fogel <kf...@newton.ch.collab.net>.
mark benedetto king <mb...@boredom.org> writes:
> Tweaking. Actually, can't tweak:
>
> $ svn propedit svn:log --revprop -r 4916
> <do some tweaking, then exit the editor>
> subversion/libsvn_ra_dav/util.c:81: (apr_err=175002)
> svn: RA layer request failed
> svn: applying property change to /repos/svn/!svn/bln/4916: 400 Bad Request
>
> Any idea why?
Hmmm. This is ringing a bell, but I can't remember where we've seen
this before. Anyone recognize it? It looks like it's getting this
error in the server's error_log:
[Mon Feb 17 23:33:35 2003] [error] [client 65.42.80.147] \
An undefined namespace prefix was used.
Anyway, in the meantime try
http://svn.collab.net/scripts/tweak-log.cgi
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 4916
Posted by mark benedetto king <mb...@boredom.org>.
On Mon, Feb 17, 2003 at 10:33:35PM -0600, Karl Fogel wrote:
>
> Might want to mention issue #1037 in the commit message.
>
Tweaking. Actually, can't tweak:
$ svn propedit svn:log --revprop -r 4916
<do some tweaking, then exit the editor>
subversion/libsvn_ra_dav/util.c:81: (apr_err=175002)
svn: RA layer request failed
svn: applying property change to /repos/svn/!svn/bln/4916: 400 Bad Request
Any idea why?
> > + * Set @a *uuid to the repository's UUID.
> > + */
> > + svn_error_t *(*get_uuid) (void *session_baton,
> > + const char **uuid);
>
> Should probably mention that *uuid has the same lifetime as the
> session_baton.
Yup.
> /* 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));
>
> Probably didn't mean to do that :-)...
>
Nope.
> 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?)
>
No, this wasn't a merge, that was earlier.
> Everything else looks great!
>
Only when compared to my blunders! :-)
--ben
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org