Author: julianfoad
Date: Wed Feb 20 23:45:32 2013
New Revision: 1448475
URL: http://svn.apache.org/r1448475
Log:
* subversion/libsvn_wc/conflicts.h
(svn_wc__conflict_skel_add_prop_conflict,
svn_wc__conflict_skel_add_tree_conflict): Improve doc strings.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.h
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1448475&r1=1448474&r2=1448475&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Wed Feb 20 23:45:32 2013
@@ -163,6 +163,8 @@ svn_wc__conflict_skel_add_text_conflict(
The DB, WRI_ABSPATH pair specifies in which working copy the conflict
will be recorded. (Needed for making the paths relative).
+ The MARKER_ABSPATH is NULL when raising a conflict in v1.8+. See below.
+
The MINE_PROPS, THEIR_OLD_PROPS and THEIR_PROPS are hashes mapping a
const char * property name to a const svn_string_t* value.
@@ -174,8 +176,14 @@ svn_wc__conflict_skel_add_text_conflict(
### Maybe useful for calling (legacy) conflict resolvers that expect one
### property conflict per invocation.
- It is an error to add another text conflict to a conflict skel that
- already contains a text conflict.
+ When raising a property conflict in the course of upgrading an old WC,
+ MARKER_ABSPATH is the path to the file containing a human-readable
+ description of the conflict, MINE_PROPS and THEIR_OLD_PROPS and
+ THEIR_PROPS are all NULL, and CONFLICTED_PROP_NAMES is an empty hash.
+
+ It is an error to add another prop conflict to a conflict skel that
+ already contains a prop conflict. (A single call to this function can
+ record that multiple properties are in conflict.)
Do temporary allocations in SCRATCH_POOL.
*/
@@ -198,9 +206,6 @@ svn_wc__conflict_skel_add_prop_conflict(
LOCAL_CHANGE is the local tree change made to the node.
INCOMING_CHANGE is the incoming change made to the node.
- It is an error to add another tree conflict to a conflict skel that
- already contains a tree conflict.
-
MOVE_SRC_OP_ROOT_ABSPATH must be set when LOCAL_CHANGE is
svn_wc_conflict_reason_moved_away and NULL otherwise and the operation
is svn_wc_operation_update or svn_wc_operation_switch. It should be
@@ -215,7 +220,9 @@ svn_wc__conflict_skel_add_prop_conflict(
with (1), MOVE_SRC_OP_ROOT_ABSPATH should be A/B for a conflict
associated with (2).
- ### Is it an error to add a tree conflict to any existing conflict?
+ It is an error to add another tree conflict to a conflict skel that
+ already contains a tree conflict. (It is not an error, at this level,
+ to add a tree conflict to an existing text or property conflict skel.)
Do temporary allocations in SCRATCH_POOL.
*/
