> -----Original Message-----
> From: Philipp Marek [mailto:philipp_at_marek.priv.at]
> Sent: zaterdag 6 september 2008 19:14
> To: Karl Fogel
> Cc: dev_at_subversion.tigris.org
> Subject: Re: Subversion properties documentation
>
> Hello Karl,
>
> thank you for the fast answer.
>
> On Saturday 06 September 2008 Karl Fogel wrote:
> > I actually think your idea of a patch to trunk svn_props.h makes the
> > most sense. Probably the best way to do this would be to:
> >
> > a) port the svn_props.h changes from your branch to trunk
> > b) add the comment on trunk
> > c) get rid of the svn_props.h changes on your branch, and...
> > d) ...port them over from trunk.
> >
> > That way the change flow will all be in the right direction.
> >
> > How does this sound to you?
> Perfect; here's point "a" for you. Not a direct port (as that got
> conflicts,
> too many changes on trunk), but a manual translation with added
> comments.
>
> If you want, I can commit that on trunk/, and try the points "c" and
> "d" also.
> I'm not so sure whether "svn merge" would write the required merge-
> properties
> in the right way (for reverse-merge "c" and forward-merge "d") - but I
> can
> try.
>
> (Has someone manually put merge information for the branches in the
> repository, to allow automatic use of "svn merge"?)
>
>
> Thank you, Karl.
>
>
> Regards,
>
> Phil
>
>
> [[[
>
> Write the properties used in the meta-data branch in the
> trunk/.../svn_props.h file, to avoid possible incompatible reuse
> of the property names.
>
> * subversion/include/svn_props.h: meta-data properties appended.
>
> ]]]
>
> Index: subversion/include/svn_props.h
> ===================================================================
> --- subversion/include/svn_props.h (Revision 32940)
> +++ subversion/include/svn_props.h (Arbeitskopie)
> @@ -303,6 +303,47 @@ svn_boolean_t svn_prop_name_is_valid(con
> */
> #define SVN_PROP_MERGEINFO SVN_PROP_PREFIX "mergeinfo"
>
> +
> +/** Meta-data properties
> + *
> + * The following properties are used for storing meta-data about
> + * individual entries in the meta-data branches of subversion,
> + * see issue 1256 http://subversion.tigris.org/issues/show_bug.cgi?id=1256,
> + * or browseable at
> + * http://svn.collab.net/viewvc/svn/branches/meta-data-versioning/ .
> + * Furthermore \c svntar (http://svn.borg.ch/svntar/) and \c FSVS
> + * (http://fsvs.tigris.org/) use these, too.
> + *
> + * They are documented here to avoid name reuse in other branches;
> + * the "plain" subversion doesn't use them (yet?).
> + *
> + * @defgroup svn_prop_meta_data Meta-data properties
> + * @{ */
> +
> +/** The files' last modification time.
> + * This is stored as string in the form \c "2008-08-07T07:38:51.008782Z", to be
This line and two other lines in this patch are more than 79 characters long.
> + * converted by the functions \ref svn_time_to_cstring() and
> + * \ref svn_time_from_cstring(). */
> +#define SVN_PROP_TEXT_TIME SVN_PROP_PREFIX "text-time"
> +
> +/** The files' owner.
> + * Stored as numeric ID, followed by whitespace, optionally followed by the
> + * string: \c "1000 pmarek". Parsers \b should accept any number of whitespace,
> + * and writers \b should put exactly a single space. */
> +#define SVN_PROP_OWNER SVN_PROP_PREFIX "owner"
Why is the unix specific numeric ID required and the more generic username optional?
And on the comment: Why is the whitespace required if you can leave the username out? :)
> +
> +/** The files' group.
> + * The same format as for \ref SVN_PROP_OWNER "the owner". */
> +#define SVN_PROP_GROUP SVN_PROP_PREFIX "group"
> +
> +/** The files' unix-mode.
> + * Stored in octal, with a leading \c 0; may have 5 digits if any of \e setuid,
> + * \e setgid or \e sticky are set; an example is \c "0644". */
> +#define SVN_PROP_UNIX_MODE SVN_PROP_PREFIX "unix-mode"
> +
> +/** @} */ /* Meta-data properties */
> +
> +
> /** @} */
>
> /** WC props are props that are invisible to users: they're generated
>
Bert
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-06 21:43:52 CEST