Author: rinrab
Date: Thu Dec 5 19:32:35 2024
New Revision: 1922335
URL: http://svn.apache.org/viewvc?rev=1922335&view=rev
Log:
In the trunk, at the merge: Format docstrings of merge_cmd_baton_t's fields,
so they will be represented above the functions. This makes the IDEs correctly
highlight them, and makes the code a bit prettier.
* subversion/libsvn_client/merge.c
(merge_cmd_baton_t): Ditto.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1922335&r1=1922334&r2=1922335&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Dec 5 19:32:35 2024
@@ -232,24 +232,31 @@ struct notify_begin_state_t
};
typedef struct merge_cmd_baton_t {
- svn_boolean_t force_delete; /* Delete a file/dir even if modified */
+ /* Delete a file/dir even if modified */
+ svn_boolean_t force_delete;
+
svn_boolean_t dry_run;
- svn_boolean_t record_only; /* Whether to merge only mergeinfo
- differences. */
- svn_boolean_t same_repos; /* Whether the merge source repository
- is the same repository as the
- target. Defaults to FALSE if DRY_RUN
- is TRUE.*/
- svn_boolean_t mergeinfo_capable; /* Whether the merge source server
- is capable of Merge Tracking. */
- svn_boolean_t ignore_mergeinfo; /* Don't honor mergeinfo; see
- doc string of do_merge(). FALSE if
- MERGE_SOURCE->ancestral is FALSE. */
- svn_boolean_t diff_ignore_ancestry; /* Diff unrelated nodes as if related;
see
- doc string of do_merge(). FALSE if
- MERGE_SOURCE->ancestral is FALSE. */
- svn_boolean_t reintegrate_merge; /* Whether this is a --reintegrate
- merge or not. */
+
+ /* Whether to merge only mergeinfo differences. */
+ svn_boolean_t record_only;
+
+ /* Whether the merge source repository is the same repository as the target.
+ Defaults to FALSE if DRY_RUN is TRUE.*/
+ svn_boolean_t same_repos;
+
+ /* Whether the merge source server is capable of Merge Tracking. */
+ svn_boolean_t mergeinfo_capable;
+
+ /* Don't honor mergeinfo; see doc string of do_merge(). FALSE if
+ MERGE_SOURCE->ancestral is FALSE. */
+ svn_boolean_t ignore_mergeinfo;
+
+ /* Diff unrelated nodes as if related; see doc string of do_merge(). FALSE
+ if MERGE_SOURCE->ancestral is FALSE. */
+ svn_boolean_t diff_ignore_ancestry;
+
+ /* Whether this is a --reintegrate merge or not. */
+ svn_boolean_t reintegrate_merge;
/* Description of merge target node */
const svn_client__merge_target_t *target;
@@ -272,7 +279,8 @@ typedef struct merge_cmd_baton_t {
comment) or a similar list for single-file-merges */
apr_array_header_t *children_with_mergeinfo;
- svn_client_ctx_t *ctx; /* Client context for callbacks, etc. */
+ /* Client context for callbacks, etc. */
+ svn_client_ctx_t *ctx;
/* The list of any paths which remained in conflict after a
resolution attempt was made. We track this in-memory, rather
