subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1205923 - /subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c
Date Thu, 24 Nov 2011 16:39:44 GMT
Author: stsp
Date: Thu Nov 24 16:39:32 2011
New Revision: 1205923

URL: http://svn.apache.org/viewvc?rev=1205923&view=rev
Log:
On the moves-scan-log branch, rename a conflict prompt option.

* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler): Rename 'suggest-move' to 'find-move'.

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=1205923&r1=1205922&r2=1205923&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 16:39:32
2011
@@ -900,7 +900,7 @@ svn_cl__conflict_handler(svn_wc_conflict
                        "Maybe this incoming delete is part of a move?\n"),
                      svn_dirent_local_style(desc->local_abspath, subpool)));
 
-      prompt = _("Select: (p) postpone, (s) suggest-move,\n"
+      prompt = _("Select: (p) postpone, (f) find-move,\n"
                  "        (a) ask-move, (d) is-delete, (h) help: ");
 
       while (1)
@@ -912,7 +912,7 @@ svn_cl__conflict_handler(svn_wc_conflict
               if (desc->suggested_moves->nelts == 0)
                 {
                   SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
-                          _("No moves found in revision log.\n")));
+                          _("No move found in revision log.\n")));
                 }
               else
                 {
@@ -935,7 +935,7 @@ svn_cl__conflict_handler(svn_wc_conflict
             {
               SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
               _("  (p) postpone      - resolve the conflict later\n"
-                "  (s) suggest-move  - suggest moves found in revision log\n"
+                "  (f) find-move     - try to find move in revision log\n"
                 "  (a) ask-move      - specify server-side move yourself\n"
                 "  (d) is-delete     - treat incoming delete as delete\n"
                 "  (h) help          - show this help\n\n")));
@@ -958,7 +958,7 @@ svn_cl__conflict_handler(svn_wc_conflict
               break;
             }
 
-          if (strcmp(answer, "s") == 0)
+          if (strcmp(answer, "f") == 0)
             {
               if (desc->suggested_moves)
                 continue;



Mime
View raw message