subversion/libsvn_client/merge.c

522  * node kind on disk of the local path LOCAL_ABSPATH.
527  *   - Return svn_wc_notify_state_inapplicable if the node kind matches.
529  *     different kind is expected, or if the disk node cannot be read.
540                           svn_node_kind_t *kind,
556   if (kind)
557     *kind = svn_node_none;
559   if (kind == NULL)
560     kind = &wc_kind;
565                                          kind,
576  * at VICTIM_ABSPATH, with merge-left node kind MERGE_LEFT_NODE_KIND
577  * and merge-right node kind MERGE_RIGHT_NODE_KIND, using information
1209      const char *kind mapping, containing deleted nodes that still need a delete
1271             svn_node_kind_t kind,
1293       notify->kind = kind;
1464       notify->kind = local_node_kind;
1479                   svn_node_kind_t kind,
1499       notify->kind = kind;
1513                      svn_node_kind_t kind,
1531       notify->kind = kind;
1548                      svn_node_kind_t kind,
1572                     svn_node_kind_to_word(kind));
1599           notify->kind = svn_node_kind_from_word(
1666           notify->kind = svn_node_dir;
1748           notify->kind = svn_node_file;
2838            * but obstructed by a node of the wrong kind. */
3943       svn_node_kind_t kind;
3958                                 older_rev, &kind, scratch_pool));
3959       if (kind == svn_node_none)
7232               range_start_rev.kind = svn_opt_revision_number;
7349       if ((range->start.kind == svn_opt_revision_unspecified)
7350           || (range->end.kind == svn_opt_revision_unspecified))
9800    of a node (if they are the same kind) as if they were related, even if
10384   if (revision->kind != svn_opt_revision_number
10385       && revision->kind != svn_opt_revision_date
10386       && revision->kind != svn_opt_revision_head
10668   svn_node_kind_t kind;
10671   SVN_ERR(svn_wc_read_kind2(&kind, ctx->wc_ctx, *target_abspath,
10673   if (kind == svn_node_dir)
10703   if ((revision1->kind == svn_opt_revision_unspecified)
10704       || (revision2->kind == svn_opt_revision_unspecified))
11251           svn_node_kind_t kind;
11255                                     source_loc->rev, &kind, iterpool));
11256           if (kind == svn_node_none)
12344   source_peg_rev.kind = svn_opt_revision_number;
12346   source_start_rev.kind = svn_opt_revision_number;
12348   source_end_rev.kind = svn_opt_revision_number;
12350   target_opt_rev.kind = svn_opt_revision_number;
12569 /** Find out what kind of automatic merge would be needed, when the target
12657    * with server.  After we find out what kind of merge is required, then if a
12769                                   "cannot be used with this kind of merge"));
12775                                   "cannot be used with this kind of merge"));
12781                                   "cannot be used with this kind of merge"));
12881                  && (target_revision->kind == svn_opt_revision_unspecified
12882                      || target_revision->kind == svn_opt_revision_working
12883                      || target_revision->kind == svn_opt_revision_base);