Hello,

I found the following output of "svn mergeinfo" troublesome to localize.

    youngest  last               repos.
    common    full     tip of    path of
    ancestor  merge    branch    branch

    2                  6       
    |                  |       
       --| |------------         branches/branch1
      /         /              
     /         /               
  -------| |------------         trunk
              |        |       
              5        6       

Would something like this not be better?

    youngest common ancestor
    |         last full merge
    |         |        tip of branch
    |         |        |         repository path

    2                  6      
    |                  |      
       --| |------------         branches/branch1
      /         /             
     /         /              
  -------| |------------         trunk
              |        |      
              5        6      

A patch to this effect is attached for consideration.

[[[
make mergeinfo diagram column headings l10n friendly

* subversion/svn/mergeinfo-cmd.c
  (mergeinfo_diagram): use one line per column heading and
   vertical lines, leaving room for l10n
]]]

Index: subversion/svn/mergeinfo-cmd.c
===================================================================
--- subversion/svn/mergeinfo-cmd.c	(revision 1437751)
+++ subversion/svn/mergeinfo-cmd.c	(working copy)
@@ -163,9 +163,10 @@ mergeinfo_diagram(const char *yca_url,
 
   /* Column headings */
   SVN_ERR(svn_cmdline_fputs(
-            _("    youngest  last               repos.\n"
-              "    common    full     tip of    path of\n"
-              "    ancestor  merge    branch    branch\n"
+            _("    youngest common ancestor\n"
+              "    |         last full merge\n"
+              "    |         |        tip of branch\n"
+              "    |         |        |         repository path\n"
               "\n"),
             stdout, pool));
 

Reply via email to