[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH v2] Conflict option labels

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 13 Oct 2016 16:40:59 +0200

On Thu, Oct 13, 2016 at 03:46:32PM +0200, Patrick Steinhardt wrote:
> * subversion/include/svn_client.h:
> - new function `svn_client_conflict_option_get_label`
> * subversion/libsvn_client/conflicts.c:
> - svn_client_conflict_option_t: add label
> - add_resolution_option: add label argument
> - implement function `svn_client_conflict_option_get_label`
> - (svn_client_conflict_text_get_reslution_options,
> svn_client_conflict_prop_get_resolution_options,
> configure_option_accept_current_wc_state,
> configure_option_move_destination,
> configure_option_update_raise_moved_away_children,
> configure_option_incoming_add_ignore,
> configure_option_incoming_added_file_text_merge,
> configure_option_incoming_added_file_replace_and_merge,
> configure_option_incoming_added_dir_merge,
> configure_option_incoming_added_dir_replace,
> configure_option_incoming_added_dir_replace_and_merge,
> configure_option_incoming_delete_ignore,
> configure_option_incoming_delete_accept,
> configure_option_incoming_move_file_merge,
> configure_option_incoming_dir_merge,
> svn_client_conflict_tree_get_resolution_options): set
> resolution option labels

This log message format is not entirely conforming to our guidelines.

Can you review existing log messages for examples and adjust your
patch submission accordingly?

The above would usually be formatted like this:

 * subversion/libsvn_client/conflicts.c
   (svn_client_conflict_option_t): Add label.
   (add_resolution_option): Add label argument.
   (svn_client_conflict_option_get_label): New function.
   (svn_client_conflict_text_get_reslution_options,
    svn_client_conflict_prop_get_resolution_options,
    configure_option_accept_current_wc_state,
    configure_option_move_destination,
    configure_option_update_raise_moved_away_children,
    configure_option_incoming_add_ignore,
    configure_option_incoming_added_file_text_merge,
    configure_option_incoming_added_file_replace_and_merge,
    configure_option_incoming_added_dir_merge,
    configure_option_incoming_added_dir_replace,
    configure_option_incoming_added_dir_replace_and_merge,
    configure_option_incoming_delete_ignore,
    configure_option_incoming_delete_accept,
    configure_option_incoming_move_file_merge,
    configure_option_incoming_dir_merge,
    svn_client_conflict_tree_get_resolution_options): Set resolution option labels.
Received on 2016-10-13 16:41:38 CEST

This is an archived mail posted to the Subversion Dev mailing list.