File Manager

003 File Manager

Current Path: /usr/src/contrib/subversion/subversion/svn

usr / src / contrib / subversion / subversion / svn /

📁 ..
📄 add-cmd.c(3.78 KB)
📄 auth-cmd.c(16.46 KB)
📄 blame-cmd.c(14.58 KB)
📄 cat-cmd.c(4.29 KB)
📄 changelist-cmd.c(4.57 KB)
📄 checkout-cmd.c(5.82 KB)
📄 cl-conflicts.c(21.93 KB)
📄 cl-conflicts.h(2.5 KB)
📄 cl-log.h(3.39 KB)
📄 cl.h(40.44 KB)
📄 cleanup-cmd.c(5.4 KB)
📄 commit-cmd.c(6.63 KB)
📄 conflict-callbacks.c(87.42 KB)
📄 copy-cmd.c(6.39 KB)
📄 delete-cmd.c(3.14 KB)
📄 deprecated.c(1.79 KB)
📄 diff-cmd.c(22.11 KB)
📄 export-cmd.c(4.75 KB)
📄 file-merge.c(32.47 KB)
📄 filesize.c(7.68 KB)
📄 help-cmd.c(7.5 KB)
📄 import-cmd.c(4.59 KB)
📄 info-cmd.c(47.29 KB)
📄 list-cmd.c(18.28 KB)
📄 lock-cmd.c(4.52 KB)
📄 log-cmd.c(31.42 KB)
📄 merge-cmd.c(22.37 KB)
📄 mergeinfo-cmd.c(16.47 KB)
📄 mkdir-cmd.c(3.5 KB)
📄 move-cmd.c(3.56 KB)
📄 notify.c(47.35 KB)
📄 patch-cmd.c(3.13 KB)
📄 propdel-cmd.c(3.66 KB)
📄 propedit-cmd.c(13.35 KB)
📄 propget-cmd.c(18.53 KB)
📄 proplist-cmd.c(11.44 KB)
📄 props.c(10.02 KB)
📄 propset-cmd.c(6.99 KB)
📄 relocate-cmd.c(4.19 KB)
📄 resolve-cmd.c(7.12 KB)
📄 resolved-cmd.c(2.9 KB)
📄 revert-cmd.c(2.99 KB)
📁 schema
📄 shelf-cmd.c(48.59 KB)
📄 shelf-cmd.h(1.47 KB)
📄 shelf2-cmd.c(47.33 KB)
📄 shelf2-cmd.h(1.48 KB)
📄 similarity.c(4.03 KB)
📄 status-cmd.c(15.72 KB)
📄 status.c(22.04 KB)
📄 svn.1(1.9 KB)
📄 svn.c(149.85 KB)
📄 switch-cmd.c(7.39 KB)
📄 unlock-cmd.c(3.28 KB)
📄 update-cmd.c(7.39 KB)
📄 upgrade-cmd.c(2.54 KB)
📄 util.c(39.66 KB)

Editing: cl-conflicts.h

/*
 * conflicts.h: Conflicts handling
 *
 * ====================================================================
 *    Licensed to the Apache Software Foundation (ASF) under one
 *    or more contributor license agreements.  See the NOTICE file
 *    distributed with this work for additional information
 *    regarding copyright ownership.  The ASF licenses this file
 *    to you under the Apache License, Version 2.0 (the
 *    "License"); you may not use this file except in compliance
 *    with the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *    Unless required by applicable law or agreed to in writing,
 *    software distributed under the License is distributed on an
 *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 *    KIND, either express or implied.  See the License for the
 *    specific language governing permissions and limitations
 *    under the License.
 * ====================================================================
 */

#ifndef SVN_CONFLICTS_H
#define SVN_CONFLICTS_H

/*** Includes. ***/
#include <apr_pools.h>

#include "svn_types.h"
#include "svn_string.h"
#include "svn_client.h"
#include "svn_wc.h"

#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */

/**
 * Return in @a desc a possibly localized human readable
 * description of a property conflict described by @a conflict.
 *
 * Allocate the result in @a pool.
 */
svn_error_t *
svn_cl__get_human_readable_prop_conflict_description(
  const char **desc,
  svn_client_conflict_t *conflict,
  apr_pool_t *pool);

/**
 * Return in @a desc a possibly localized human readable
 * description of a tree conflict described by @a conflict.
 *
 * Allocate the result in @a pool.
 */
svn_error_t *
svn_cl__get_human_readable_tree_conflict_description(
  const char **desc,
  svn_client_conflict_t *conflict,
  apr_pool_t *pool);

/* Like svn_cl__get_human_readable_tree_conflict_description but
   for other conflict types */
svn_error_t *
svn_cl__get_human_readable_action_description(
        const char **desc,
        svn_wc_conflict_action_t action,
        svn_wc_operation_t operation,
        svn_node_kind_t kind,
        apr_pool_t *pool);

/**
 * Append to @a str an XML representation of the conflict data
 * for @a conflict, in a format suitable for 'svn info --xml'.
 */
svn_error_t *
svn_cl__append_conflict_info_xml(
  svn_stringbuf_t *str,
  svn_client_conflict_t *conflict,
  apr_pool_t *pool);

#ifdef __cplusplus
}
#endif /* __cplusplus */

#endif /* SVN_CONFLICTS_H */

003 File Manager

Editing: cl-conflicts.h

Upload File

Create Folder