svn commit: r1393209 - /subversion/trunk/subversion/svn/mergeinfo-cmd.c

[ju...@apache.org]

Author: julianfoad
Date: Tue Oct  2 22:08:34 2012
New Revision: 1393209

URL: http://svn.apache.org/viewvc?rev=1393209&view=rev
Log:
In the 'svn mergeinfo' summary mode, fix the target branch tip being displayed
as 'WC': it currently always acts on a repository target so should always show a
rev num here.

* subversion/svn/mergeinfo-cmd.c:
  (mergeinfo_diagram, mergeinfo_summary): Correct two inverted-sense errors
    that did not quite cancel each other out.

Modified:
    subversion/trunk/subversion/svn/mergeinfo-cmd.c

Modified: subversion/trunk/subversion/svn/mergeinfo-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mergeinfo-cmd.c?rev=1393209&r1=1393208&r2=1393209&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/trunk/subversion/svn/mergeinfo-cmd.c Tue Oct  2 22:08:34 2012
@@ -149,8 +149,8 @@ mergeinfo_diagram(svn_client__pathrev_t 
       g[4][3] = "        ";
       g[5][3] = "-       ";
       g[6][3] = "|       ";
-      g[7][3] = target_is_wc ? apr_psprintf(pool, "%-8ld", target->rev)
-                             : "WC      ";
+      g[7][3] = target_is_wc ? "WC      "
+                             : apr_psprintf(pool, "%-8ld", target->rev);
     }
 
   /* Find the width of each column, so we know how to print blank cells */
@@ -216,7 +216,7 @@ mergeinfo_summary(
   svn_client__pathrev_t *yca, *base, *right, *target;
   svn_boolean_t target_is_wc, reintegrate_like;
 
-  target_is_wc = svn_path_is_url(target_path_or_url)
+  target_is_wc = (! svn_path_is_url(target_path_or_url))
                  && (target_revision->kind == svn_opt_revision_unspecified
                      || target_revision->kind == svn_opt_revision_working);
   if (target_is_wc)