Re: svn commit: r25931 - in trunk/subversion: libsvn_wc tests/cmdline

[Erik Huelsmann <eh...@gmail.com>]

> (Also start taking a stab at making prop-merging more robust.)

> +/* Add the property with name PROPNAME to the set of WORKING_PROPS,
> + * setting *STATE or *CONFLICT according to merge outcomes.
> + *
> + * *STATE is an input and output parameter, its value is to be
> + * set using set_merge_prop_state().
> + *
> + * BASE_VAL contains the working copy base property value

These BASE_VAL parameters fall into the department of '*start* taking
a stab'. I hope to commit a followup today or tomorrow, solving some
issues with properties in merges, such as 'merge deletes locally
modified property where local value happens to be the value the server
wants to delete'. And other such rare forms, but, hey, it's
dataloss...

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org