Gabriela Gibson wrote on Sat, Mar 30, 2013 at 21:31:31 +0000:
> [[[
>
> Change the label strings for "svn merge" and "svn update" when
> diff3-cmd is used to match the label strings for "svn diff" when
> diff-cmd is used.
>
> * subversion/libsvn_wc/update_editor.c
> (svn_wc__perform_file_merge): Alter label to include filename.
>
> ]]]
> Index: subversion/libsvn_wc/update_editor.c
> ===================================================================
> --- subversion/libsvn_wc/update_editor.c (revision 1460218)
> +++ subversion/libsvn_wc/update_editor.c (working copy)
> @@ -3792,16 +3795,20 @@ svn_wc__perform_file_merge(svn_skel_t **work_items
> if (!SVN_IS_VALID_REVNUM(old_revision))
> old_revision = 0;
>
> - oldrev_str = apr_psprintf(scratch_pool, ".r%ld%s%s",
> +
> + oldrev_str = apr_psprintf(scratch_pool, "%s\t(revision %ld) %s%s",
> + child_relpath,
> old_revision,
> *path_ext ? "." : "",
> *path_ext ? path_ext : "");
Code inspection tells me that oldrev_str can become the @a suffix
parameter to the svn_io_open_uniquely_named() call in
preserve_pre_merge_files(), in which case [\t ()] are all inappropriate
characters.
I assume the "label" you refer to is the text following the
<<<<<</======/>>>>>> conflict markers?
Received on 2013-03-31 01:39:44 CET