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

Re: Subversion properties documentation

From: Philipp Marek <philipp_at_marek.priv.at>
Date: Sat, 6 Sep 2008 19:13:34 +0200

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.

]]]

-- 
Versioning your /etc, /home or even your whole installation?
             Try fsvs (fsvs.tigris.org)!


---------------------------------------------------------------------
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 19:13:46 CEST

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