55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
---
|
|
subversion/include/svn_types.h | 4 ++--
|
|
subversion/include/svn_wc.h | 6 +++---
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/subversion/include/svn_types.h
|
|
+++ b/subversion/include/svn_types.h
|
|
@@ -257,7 +257,7 @@ typedef enum
|
|
in any files or subdirectories not already present; those
|
|
subdirectories' this_dir entries will have depth-infinity.
|
|
Equivalent to the pre-1.5 default update behavior. */
|
|
- svn_depth_infinity = 3,
|
|
+ svn_depth_infinity = 3
|
|
|
|
} svn_depth_t;
|
|
|
|
@@ -841,7 +841,7 @@ typedef enum
|
|
svn_rangelist_equal_inheritance,
|
|
|
|
/* Inheritability of both ranges must be @c TRUE. */
|
|
- svn_rangelist_only_inheritable,
|
|
+ svn_rangelist_only_inheritable
|
|
} svn_merge_range_inheritance_t;
|
|
|
|
/**
|
|
--- a/subversion/include/svn_wc.h
|
|
+++ b/subversion/include/svn_wc.h
|
|
@@ -772,7 +772,7 @@ typedef enum svn_wc_notify_action_t
|
|
svn_wc_notify_merge_begin,
|
|
|
|
/** Replace notification. */
|
|
- svn_wc_notify_update_replace,
|
|
+ svn_wc_notify_update_replace
|
|
|
|
} svn_wc_notify_action_t;
|
|
|
|
@@ -1047,7 +1047,7 @@ typedef enum svn_wc_conflict_reason_t
|
|
typedef enum svn_wc_conflict_kind_t
|
|
{
|
|
svn_wc_conflict_kind_text, /* textual conflict (on a file) */
|
|
- svn_wc_conflict_kind_property, /* property conflict (on a file or dir) */
|
|
+ svn_wc_conflict_kind_property /* property conflict (on a file or dir) */
|
|
|
|
/* ### Add future kinds here that represent "tree" conflicts. */
|
|
|
|
@@ -1132,7 +1132,7 @@ typedef enum svn_wc_conflict_choice_t
|
|
svn_wc_conflict_choose_base, /* user chooses the original version */
|
|
svn_wc_conflict_choose_theirs, /* user chooses incoming version */
|
|
svn_wc_conflict_choose_mine, /* user chooses his/her own version */
|
|
- svn_wc_conflict_choose_merged, /* user chooses the merged version */
|
|
+ svn_wc_conflict_choose_merged /* user chooses the merged version */
|
|
|
|
} svn_wc_conflict_choice_t;
|
|
|