[PATCH] Change label strings in svn up to match svn diff

[Gabriela Gibson]

[[[

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)
@@ -3768,7 +3768,9 @@ svn_wc__perform_file_merge(svn_skel_t **work_items
   const char *new_text_base_tmp_abspath;
   enum svn_wc_merge_outcome_t merge_outcome = svn_wc_merge_unchanged;
   svn_skel_t *work_item;
+  const char *child_relpath = svn_dirent_skip_ancestor(wri_abspath,
+                                                         local_abspath);
 
   *work_items = NULL;
 
   SVN_ERR(svn_wc__db_pristine_get_path(&new_text_base_tmp_abspath,
@@ -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 : "");
 
-  newrev_str = apr_psprintf(scratch_pool, ".r%ld%s%s",
+  newrev_str = apr_psprintf(scratch_pool, "%s\t(revision %ld) %s%s",
+			    child_relpath,
                             target_revision,
                             *path_ext ? "." : "",
                             *path_ext ? path_ext : "");
-  mine_str = apr_psprintf(scratch_pool, ".mine%s%s",
+  mine_str = apr_psprintf(scratch_pool, "%s\t(working copy) %s%s",
+			  child_relpath,
                           *path_ext ? "." : "",
                           *path_ext ? path_ext : "");