svn commit: r1205777 - /subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c

[st...@apache.org]

Author: stsp
Date: Thu Nov 24 10:24:28 2011
New Revision: 1205777

URL: http://svn.apache.org/viewvc?rev=1205777&view=rev
Log:
On the moves-scan-log branch, improve the moves prompt.

* subversion/svn/conflict-callbacks.c
  (pick_move): Don't append the revision the move happened in to the move
   target (making it look like a peg revision). This syntax is confusing
   and is even wrong in case we're updating into the past. Just print the
   revision on its own, without associating a path with it.

Modified:
    subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c

Modified: subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c?rev=1205777&r1=1205776&r2=1205777&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c (original)
+++ subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c Thu Nov 24 10:24:28 2011
@@ -273,11 +273,11 @@ pick_move(svn_wc_repos_move_info_t **mov
     {
       prompt = apr_pstrcat(scratch_pool, prompt,
                   apr_psprintf(scratch_pool,
-                                _("  (%i) %s@%ld -> %s@%ld\n"),
-                                i, this_move->moved_from_repos_relpath,
+                                _("  (%i) [r%ld] %s@%ld -> %s\n"),
+                                i, this_move->revision,
+                                this_move->moved_from_repos_relpath,
                                 this_move->copyfrom_rev,
-                                this_move->moved_to_repos_relpath,
-                                this_move->revision),
+                                this_move->moved_to_repos_relpath),
                   (char *)NULL);
       i++;
       this_move = this_move->next;