subversion/libsvn_wc/update_editor.c

80  *     if target is already in conflict or obstructed:
83  *     if this action will cause a tree conflict:
84  *       record the tree conflict
93  *   1.   if  # Incoming change is inside an item already in conflict:
97  *          notify "skipped because already in conflict" just once
100  *        if  # Incoming change affects an item already in conflict:
107  *          notify "skipped because already in conflict"
116  *   3.   if  # Incoming change raises a tree conflict:
122  *          notify "tree conflict"
138  * [*2] Details of which combinations of property and text changes conflict
143  *        - Mark the conflict as resolved;
145  *      Ideally, it would be possible to resolve any conflict without
147  *      necessary data at conflict detection time, and delay the update of
173      generated conflict files. */
212      of conflict checks to be omitted. */
244   /* This editor will invoke a interactive conflict-resolution
342      installed tree conflict.
369   /* The tree conflict to install once the node is really edited */
755   /* The tree conflict to install once the node is really edited */
832 /* Complete a conflict skel by describing the update.
834  * LOCAL_KIND is the node kind of the tree conflict victim in the
838  * needed for the returned conflict struct are made in RESULT_POOL.
841 complete_conflict(svn_skel_t *conflict,
856   if (!conflict)
859   SVN_ERR(svn_wc__conflict_skel_is_complete(&is_complete, conflict));
885     SVN_ERR(svn_wc__conflict_skel_set_op_switch(conflict,
890     SVN_ERR(svn_wc__conflict_skel_set_op_update(conflict,
900    tree conflict on a node for a no-change edit */
914       /* We have a (delayed) tree conflict to install */
937    tree conflict on a node for a no-change edit */
950       /* We have a (delayed) tree conflict to install */
1256              raise a move-edit tree-conflict on the move root to
1268               /* We are raising the tree-conflict on some parent of
1270                  so raise the conflict now. */
1300       /* ### TODO: Add some tree conflict and obstruction detection, etc. like
1419 /* Check whether the incoming change ACTION on FULL_PATH would conflict with
1420  * LOCAL_ABSPATH's scheduled change. If so, then raise a tree conflict with
1430  * If a tree conflict reason was found for the incoming action, the resulting
1431  * tree conflict info is returned in *PCONFLICT. PCONFLICT must be non-NULL,
1434  * The tree conflict is allocated in RESULT_POOL. Temporary allocations use
1456    * be the "reason" of a tree-conflict with the incoming "action". */
1465              * is an 'update', so the local add can only conflict with an
1526              * tree-conflict. (It's possibly a text- or prop-conflict,
1581            committed, so no conflict possible during update. */
1592     /* No conflict with the current action. */
1629   /* A conflict was detected. Create a conflict skel to record it. */
1643 /* If LOCAL_ABSPATH is inside a conflicted tree and the conflict is
1644  * not a moved-away-edit conflict, set *CONFLICTED to TRUE.  Otherwise
1686 /* Temporary helper until the new conflict handling is in place */
1792   /* Is this path a conflict victim? */
1834   /* Is this path the victim of a newly-discovered tree conflict?  If so,
1840    * a tree-conflict on a parent node. */
1857       /* When we raise a tree conflict on a node, we don't want to mark the
1878            * To prepare the "accept mine" resolution for the tree conflict,
1891            * We must complete the deletion, leaving the tree conflict info
2115     versioned_locally_and_present = FALSE; /* Tree conflict ACTUAL-only node */
2119   /* Is this path a conflict victim? */
2129              replacement. Let's install a better tree conflict. */
2131           /* ### Should store the conflict in DB to allow reinstalling
2164       /* Record this conflict so that its descendants are skipped silently. */
2176          the node in once this conflict is resolved.
2215          A dir added with history is a tree conflict. */
2232       /* Do tree conflict checking if
2239        * local add. So switch always alerts the user with a tree conflict. */
2261       /* Unversioned, obstructing dirs are handled by prop merge/conflict,
2268           /* Mark a conflict */
2328      deleted tree, then suppress notification, a tree conflict was already
2420   /* Is this path a conflict victim? */
2443   /* Is this path a fresh tree conflict victim?  If so, skip the tree
2447    * a tree-conflict on a parent node. */
2459       /* Other modifications wouldn't be a tree conflict */
2998      genuine tree-conflict.  */
3042          ### This should be recorded as a tree conflict and the update
3216     versioned_locally_and_present = FALSE; /* Tree conflict ACTUAL-only node */
3221   /* Is this path a conflict victim? */
3233              replacement. Let's install a better tree conflict. */
3235           /* ### Should store the conflict in DB to allow reinstalling
3265   /* Now the usual conflict handling: skip. */
3279          the node in once this conflict is resolved.
3315          or symlink, let close_file() check for a tree conflict.
3332       /* Do tree conflict checking if
3339        * local add. So switch always alerts the user with a tree conflict. */
3362       /* Unversioned, obstructing files are handled by text merge/conflict,
3369           /* Mark a conflict */
3504   /* Is this path a conflict victim? */
3530    * a tree-conflict on a parent node. */
3537   /* Is this path the victim of a newly-discovered tree conflict? */
3542       /* Other modifications wouldn't be a tree conflict */
3794              modified we want a tree conflict just like how we would handle
3824              mark a tree conflict and handle the rest of the update as
3892      preserve in generated conflict file names, then find
3894      the ones we want to keep in conflict filenames,
3903   /* old_revision can be invalid when the conflict is against a
5431                                   NULL /* conflict */,
5522                                    NULL /* conflict */,