svn commit: r1639710 - /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

[julianfoad]

Author: julianfoad
Date: Fri Nov 14 17:40:16 2014
New Revision: 1639710

URL: http://svn.apache.org/r1639710
Log:
On the 'move-tracking-2' branch: A follow-up fix and tweak to r1639700.

* subversion/svnmover/svnmover.c
  (svn_branch_diff_r): Fix a crash in the 'branch deleted' case. Tweak the
    displayed messages.

Modified:
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1639710&r1=1639709&r2=1639710&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c 
(original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Fri Nov 
14 17:40:16 2014
@@ -950,20 +950,20 @@ svn_branch_diff_r(svn_editor3_t *editor,
 
   if (!left)
     {
-      printf("--- branch %d added at '/%s'\n",
-             right->branch->sibling_defn->bid,
+      printf("--- branch added, family %d, at '/%s'\n",
+             right->branch->sibling_defn->family->fid,
              svn_branch_get_root_rrpath(right->branch, scratch_pool));
     }
   else if (!right)
     {
-      printf("--- branch %d deleted at '/%s'\n",
-             right->branch->sibling_defn->bid,
-             svn_branch_get_root_rrpath(right->branch, scratch_pool));
+      printf("--- branch deleted, family %d, at '/%s'\n",
+             left->branch->sibling_defn->family->fid,
+             svn_branch_get_root_rrpath(left->branch, scratch_pool));
     }
   else
     {
-      printf("--- branch %d at (left) '/%s' (right) '/%s'\n",
-             right->branch->sibling_defn->bid,
+      printf("--- branch diff, family %d, at left '/%s' right '/%s'\n",
+             right->branch->sibling_defn->family->fid,
              svn_branch_get_root_rrpath(left->branch, scratch_pool),
              svn_branch_get_root_rrpath(right->branch, scratch_pool));
       SVN_ERR(svn_branch_diff(editor, left, right, scratch_pool));