On Fri, 23 Mar 2007, lundblad@tigris.org wrote:
> Author: lundblad
> Date: Fri Mar 23 06:57:41 2007
> New Revision: 24045
>
> Log:
> Split a file into two.
>
> Suggested by: sanity
>
> * subversion/libsvn_client/diff.c
> (svn_client_diff_summarize_dup): Move to "public APIs' section.
> (ENSURE_VALID_REVISION_KINDS, check_scheme_match,
> svn_client__dry_run_deletions, dry_run_deleted_p, merge_props_changed,
> merge_file_changed, merge_file_added, merge_file_deleted, merge_dir_added,
> merge_delete_notify_baton_t, merge_delete_notify_func, merge_dir_deleted,
> merge_callbacks, get_wc_merge_info, get_wc_and_repos_merge_info,
> calculate_merge_ranges, notification_receiver_baton_t, notification_receiver,
> default_conflict_resolver, determine_merges_performed,
> update_wc_merge_info, merge_type, grok_range_info_from_opt_revisions,
> do_merge, single_file_merge_get_file, do_single_file_merge,
> discover_and_merge_children, svn_client_merge3, svn_client_merge2,
> svn_client_merge, svn_client_merge_peg3, svn_client_merge_peg2,
> svn_client_merge_peg): Move to...
>
> * subversion/libsvn_client/merge.c: ... this new file.
...
Thank you, sanity! I can't tell you how hard it was to hold off on
doing that until the merge occurred... ;-)
- application/pgp-signature attachment: stored
Received on Fri Mar 23 18:20:00 2007