subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1190249 - in /subversion/branches/showing-merge-info/subversion/svn: merge-cmd.c mergeinfo-cmd.c
Date Fri, 28 Oct 2011 11:22:17 GMT
Author: julianfoad
Date: Fri Oct 28 11:22:17 2011
New Revision: 1190249

URL: http://svn.apache.org/viewvc?rev=1190249&view=rev
Log:
On the 'showing-merge-info' branch: Tweak messages.

* subversion/svn/merge-cmd.c
  (svn_cl__merge): Say 'copy-source' instead of 'copied-from source'.

* subversion/svn/mergeinfo-cmd.c
  (svn_cl__mergeinfo): Same.

Suggested by: jcorvel

Modified:
    subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c
    subversion/branches/showing-merge-info/subversion/svn/mergeinfo-cmd.c

Modified: subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c?rev=1190249&r1=1190248&r2=1190249&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c (original)
+++ subversion/branches/showing-merge-info/subversion/svn/merge-cmd.c Fri Oct 28 11:22:17
2011
@@ -123,7 +123,7 @@ svn_cl__merge(apr_getopt_t *os,
       SVN_ERR(svn_client__target(&target, "", NULL, pool));
       SVN_ERR(svn_cl__find_merge_source_branch(&source, target, ctx, pool));
       SVN_ERR(svn_client__resolve_target_location(source, NULL, ctx, pool));
-      printf("Assuming source branch is copied-from source of target branch: '%s'\n",
+      printf("Assuming source branch is copy-source of target branch: '%s'\n",
              svn_cl__target_for_display(source, pool));
       peg_revision1 = source->peg_revision;
       sourcepath1 = source->path_or_url;

Modified: subversion/branches/showing-merge-info/subversion/svn/mergeinfo-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/svn/mergeinfo-cmd.c?rev=1190249&r1=1190248&r2=1190249&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/branches/showing-merge-info/subversion/svn/mergeinfo-cmd.c Fri Oct 28 11:22:17
2011
@@ -252,7 +252,7 @@ svn_cl__mergeinfo(apr_getopt_t *os,
     }
   else
     {
-      printf("Assuming source branch is copied-from source of target branch.\n");
+      printf("Assuming source branch is copy-source of target branch.\n");
       SVN_ERR(svn_cl__find_merge_source_branch(&source, target, ctx, pool));
     }
 



Mime
View raw message