[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    
From:       dlr () tigris ! org
Date:       2006-07-31 19:23:39
Message-ID: 20060731192339.54FFB34C09F () svn ! collab ! net
[Download RAW message or body]

Author: dlr
Date: Mon Jul 31 12:23:38 2006
New Revision: 20917

Modified:
   branches/1.4.x/   (props changed)
   branches/1.4.x/STATUS
   branches/1.4.x/subversion/svnsync/main.c
   branches/1.4.x/subversion/tests/cmdline/svnsync_tests.py

Log:
Merge r20874 from trunk into the 1.4.x branch, improving the output
from svnsync.

Votes: +1: cmpilato, dlr, rooneg


Modified: branches/1.4.x/STATUS
URL: http://svn.collab.net/viewvc/svn/branches/1.4.x/STATUS?pathrev=20917&r1=20916&r2=20917
 ==============================================================================
--- branches/1.4.x/STATUS	(original)
+++ branches/1.4.x/STATUS	Mon Jul 31 12:23:38 2006
@@ -79,17 +79,6 @@
 
 Approved changes:
 
-  * r20874
-    Improve the output from svnsync to use the correct verb tense, to
-    not abbreviate unnecessarily, to report that properties were copied
-    successfully, and to (in general) more closely match output from our
-    other binaries.
-    Justification:
-      Our output text is a form of API.  If we don't fix this stuff now,
-      we're stuck with it for a while.
-    Votes:
-      +1: cmpilato, dlr, rooneg
-
   * r20879, r20880
     Fix segfaults caused by faulty svnsync user input.
     Justification:

Modified: branches/1.4.x/subversion/svnsync/main.c
URL: http://svn.collab.net/viewvc/svn/branches/1.4.x/subversion/svnsync/main.c?pathrev=20917&r1=20916&r2=20917
 ==============================================================================
--- branches/1.4.x/subversion/svnsync/main.c	(original)
+++ branches/1.4.x/subversion/svnsync/main.c	Mon Jul 31 12:23:38 2006
@@ -422,7 +422,7 @@
 {
   sync_baton_t *sb = baton;
 
-  SVN_ERR(svn_cmdline_printf(pool, _("Committing rev %ld\n"),
+  SVN_ERR(svn_cmdline_printf(pool, _("Committed revision %ld.\n"),
                              commit_info->revision));
 
   sb->committed_rev = commit_info->revision;
@@ -825,6 +825,8 @@
                                      subpool));
     }
 
+  SVN_ERR(svn_cmdline_printf(subpool, 
+                             _("Copied properties for revision %ld.\n"), rev));
   svn_pool_destroy(subpool);
 
   return SVN_NO_ERROR;

Modified: branches/1.4.x/subversion/tests/cmdline/svnsync_tests.py
URL: http://svn.collab.net/viewvc/svn/branches/1.4.x/subversion/tests/cmdline/svnsync_tests.py?pathrev=20917&r1=20916&r2=20917
 ==============================================================================
--- branches/1.4.x/subversion/tests/cmdline/svnsync_tests.py	(original)
+++ branches/1.4.x/subversion/tests/cmdline/svnsync_tests.py	Mon Jul 31 12:23:38 2006
@@ -68,7 +68,7 @@
   if errput:
     raise svntest.actions.SVNUnexpectedStderr(errput)
   if not output:
-    # should be: ['Committing rev 1\n', 'Committing rev 2\n']
+    # should be: ['Committed revision 1.\n', 'Committed revision 2.\n']
     raise svntest.actions.SVNUnexpectedStdout("Missing stdout")
 
 def run_init(dst_url, src_url):

---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org


[prev in list] [next in list] [prev in thread] [next in thread]